staging: vt6655,vt6656: fix sparse error "unexpected unlock"
authorCédric Cabessa <ced@ryick.net>
Wed, 26 Mar 2014 16:49:01 +0000 (17:49 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Apr 2014 23:07:42 +0000 (16:07 -0700)
Signed-off-by: Cédric Cabessa <ced@ryick.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6655/wpactl.c
drivers/staging/vt6656/firmware.c

index d17224f..9f0715c 100644 (file)
@@ -188,7 +188,8 @@ int wpa_set_wpadev(PSDevice pDevice, int val)
  *
  */
 
-int wpa_set_keys(PSDevice pDevice, void *ctx, bool fcpfkernel)
+int wpa_set_keys(PSDevice pDevice, void *ctx,
+                bool fcpfkernel) __must_hold(&pDevice->lock)
 {
        struct viawget_wpa_param *param = ctx;
        PSMgmtObject pMgmt = pDevice->pMgmt;
index cd2ea76..15c1e86 100644 (file)
@@ -31,6 +31,7 @@
  *
  */
 
+#include <linux/compiler.h>
 #include "firmware.h"
 #include "control.h"
 #include "rndis.h"
@@ -43,7 +44,7 @@ static int msglevel = MSG_LEVEL_INFO;
 
 #define FIRMWARE_CHUNK_SIZE    0x400
 
-int FIRMWAREbDownload(struct vnt_private *pDevice)
+int FIRMWAREbDownload(struct vnt_private *pDevice) __must_hold(&pDevice->lock)
 {
        struct device *dev = &pDevice->usb->dev;
        const struct firmware *fw;