[19/27] USB: cdc-wdm: fix misuse of logical operation in place of bitop

From: Greg KH
Date: Mon Jan 23 2012 - 19:09:29 EST


2.6.32-longterm review patch. If anyone has any objections, please let me know.

------------------

From: David Sterba <dsterba@xxxxxxx>

commit 0cdfb819b6a97e79c7a0aa0c471cd7000367103b upstream.

CC: Greg Kroah-Hartman <gregkh@xxxxxxx>
CC: Oliver Neukum <oliver@xxxxxxxxxx>
CC: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Signed-off-by: David Sterba <dsterba@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
Signed-off-by: Bjørn Mork <bjorn@xxxxxxx>

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


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/