Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[karo-tx-linux.git] / drivers / char / snsc.c

diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c
index 10e56323f3902faf66cd5fc5b8fd83272505b378..ec07f0e99732ec89d1798975c9c9dab3fcb137a8 100644 (file)
--- a/drivers/char/snsc.c
+++ b/drivers/char/snsc.c
@@ -285,7 +285,7 @@ scdrv_write(struct file *file, const char __user *buf,
                DECLARE_WAITQUEUE(wait, current);
 
                if (file->f_flags & O_NONBLOCK) {
-                       spin_unlock(&sd->sd_wlock);
+                       spin_unlock_irqrestore(&sd->sd_wlock, flags);
                        up(&sd->sd_wbs);
                        return -EAGAIN;
                }