USB: fix bitmask merge error (a91b593e) · Commits · 戴 / test

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:

drivers/usb/storage/usb.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -434,7 +434,8 @@ static void adjust_quirks(struct us_data *us)
		u16 vid = le16_to_cpu(us->pusb_dev->descriptor.idVendor);
		u16 pid = le16_to_cpu(us->pusb_dev->descriptor.idProduct);
		unsigned f = 0;
		unsigned int mask = (US_FL_SANE_SENSE \| US_FL_FIX_CAPACITY \|
		unsigned int mask = (US_FL_SANE_SENSE \| US_FL_BAD_SENSE \|
		US_FL_FIX_CAPACITY \|
		US_FL_CAPACITY_HEURISTICS \| US_FL_IGNORE_DEVICE \|
		US_FL_NOT_LOCKABLE \| US_FL_MAX_SECTORS_64 \|
		US_FL_CAPACITY_OK \| US_FL_IGNORE_RESIDUE \|