From 0631213f3f6ee776db2fb2136778b570d6a17cab Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Wed, 8 Jan 2014 20:57:44 +0200
Subject: mei: nfc: mei_nfc_free has to be called under lock

nfc_nfc_free unlink clients from the device list
and has to be called under mei mutex

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Reviewed-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/misc/mei/nfc.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'drivers/misc')

diff --git a/drivers/misc/mei/nfc.c b/drivers/misc/mei/nfc.c
index 0a892205ce7..54961903bf2 100644
--- a/drivers/misc/mei/nfc.c
+++ b/drivers/misc/mei/nfc.c
@@ -469,7 +469,9 @@ static void mei_nfc_init(struct work_struct *work)
 	return;
 
 err:
+	mutex_lock(&dev->device_lock);
 	mei_nfc_free(ndev);
+	mutex_unlock(&dev->device_lock);
 
 	return;
 }
-- 
cgit v1.2.3-70-g09d2