Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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>
authored by Alan Stern and committed by Greg Kroah-Hartman a91b593e 25915302
+2
-1
drivers/usb/storage/usb.c
+2
-1
drivers/usb/storage/usb.c
···
434
434
u16 vid = le16_to_cpu(us->pusb_dev->descriptor.idVendor);
435
435
u16 pid = le16_to_cpu(us->pusb_dev->descriptor.idProduct);
436
436
unsigned f = 0;
437
-
unsigned int mask = (US_FL_SANE_SENSE | US_FL_FIX_CAPACITY |
437
+
unsigned int mask = (US_FL_SANE_SENSE | US_FL_BAD_SENSE |
438
+
US_FL_FIX_CAPACITY |
438
439
US_FL_CAPACITY_HEURISTICS | US_FL_IGNORE_DEVICE |
439
440
US_FL_NOT_LOCKABLE | US_FL_MAX_SECTORS_64 |
440
441
US_FL_CAPACITY_OK | US_FL_IGNORE_RESIDUE |