blob: 3dc5ef9f7a9891418a10d99c30acd6c6941689e0 [file] [log] [blame]
From 0cdfb819b6a97e79c7a0aa0c471cd7000367103b Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.cz>
Date: Mon, 27 Dec 2010 18:49:58 +0100
Subject: USB: cdc-wdm: fix misuse of logical operation in place of bitop
From: David Sterba <dsterba@suse.cz>
commit 0cdfb819b6a97e79c7a0aa0c471cd7000367103b upstream.
CC: Greg Kroah-Hartman <gregkh@suse.de>
CC: Oliver Neukum <oliver@neukum.org>
CC: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: BjΓΈrn Mork <bjorn@mork.no>
---
drivers/usb/class/cdc-wdm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -314,7 +314,7 @@ static ssize_t wdm_write
if (r < 0)
goto outnp;
- if (!file->f_flags && O_NONBLOCK)
+ if (!(file->f_flags & O_NONBLOCK))
r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE,
&desc->flags));
else