USB: fix bitmask merge error
commitfa68188da8abe7c20cf44f19326c81a74498b921
authorAlan Stern <stern@rowland.harvard.edu>
Wed, 23 Dec 2009 04:16:32 +0000 (22 23:16 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 25 Jan 2010 18:49:30 +0000 (25 10:49 -0800)
treeaf5ff0efa46ce2759bdd2efa08bce47ec0d7dc5e
parent911b8be09d303ee5c63295be2ad7b39eec899f45
USB: fix bitmask merge error

commit a91b593edd4b3e8aa91f671b763b27b8119eb49d upstream.

This patch adds a mask bit which was mistakenly omitted from the
as1311 patch (usb-storage: add BAD_SENSE flag).

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/storage/usb.c