From: David Sterba <dsterba@suse.cz>
Date: Mon, 27 Dec 2010 17:49:58 +0000 (+0100)
Subject: USB: cdc-wdm: fix misuse of logical operation in place of bitop
X-Git-Tag: v2.6.32.55~9
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a979c54ee6bac03999183e1c6aa9dea193be98ca;p=linux-pvops.git

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>
---

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