USB: fix bitmask merge error
authorAlan Stern <stern@rowland.harvard.edu>
Wed, 23 Dec 2009 04:16:32 +0000 (23:16 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 20 Jan 2010 23:24:34 +0000 (15:24 -0800)
commita91b593edd4b3e8aa91f671b763b27b8119eb49d
tree16f7ad044d5237df094b0f5a40bd4eb5199ef9a5
parent2591530204a76fecc843529ade56afe865dd2657
USB: fix bitmask merge error

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>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/storage/usb.c