aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.cz>2010-12-27 18:49:58 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2012-01-25 13:53:23 -0800
commita979c54ee6bac03999183e1c6aa9dea193be98ca (patch)
tree532fcdbd7608dc392481d40cc5710b20a804e242
parent81cdb4f56aac1df85f33beb62e1c454d9022deaa (diff)
USB: cdc-wdm: fix misuse of logical operation in place of bitop
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>
-rw-r--r--drivers/usb/class/cdc-wdm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index 3e564bfe17d1..949b448fd13e 100644
--- 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