From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755307Ab2AXAJc (ORCPT ); Mon, 23 Jan 2012 19:09:32 -0500 Received: from cantor2.suse.de ([195.135.220.15]:42103 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755259Ab2AWXqg (ORCPT ); Mon, 23 Jan 2012 18:46:36 -0500 X-Mailbox-Line: From gregkh@clark.kroah.org Mon Jan 23 15:42:03 2012 Message-Id: <20120123234203.284146075@clark.kroah.org> User-Agent: quilt/0.50-11.1 Date: Mon, 23 Jan 2012 15:41:05 -0800 From: Greg KH To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Oliver Neukum , Marcel Holtmann , David Sterba , =?UTF-8?q?Bj=C3=B8rn=20Mork?= Subject: [19/27] USB: cdc-wdm: fix misuse of logical operation in place of bitop In-Reply-To: <20120123234224.GA19510@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.32-longterm review patch. If anyone has any objections, please let me know. ------------------ From: David Sterba commit 0cdfb819b6a97e79c7a0aa0c471cd7000367103b upstream. CC: Greg Kroah-Hartman CC: Oliver Neukum CC: Marcel Holtmann Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman Signed-off-by: Bjørn Mork --- 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