diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2009-12-22 23:16:32 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-01-25 10:49:30 -0800 |
| commit | fa68188da8abe7c20cf44f19326c81a74498b921 (patch) | |
| tree | af5ff0efa46ce2759bdd2efa08bce47ec0d7dc5e | |
| parent | 911b8be09d303ee5c63295be2ad7b39eec899f45 (diff) | |
| download | lwn-fa68188da8abe7c20cf44f19326c81a74498b921.tar.gz lwn-fa68188da8abe7c20cf44f19326c81a74498b921.zip | |
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>
| -rw-r--r-- | drivers/usb/storage/usb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c index 716c8d7885fa..33197fa22715 100644 --- a/drivers/usb/storage/usb.c +++ b/drivers/usb/storage/usb.c @@ -430,7 +430,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 | |