diff options
| author | JP Abgrall <jpa@google.com> | 2012-05-08 16:49:25 -0700 |
|---|---|---|
| committer | JP Abgrall <jpa@google.com> | 2012-05-08 16:49:25 -0700 |
| commit | 36c97064196c4549f7f5353fdce970d62b4795f9 (patch) | |
| tree | ac39335466302c267a5485232da7c1df13e2a76b /drivers/usb/gadget/f_mass_storage.c | |
| parent | 11e410cc6d1483328839cd3df8b554299e86aede (diff) | |
| parent | 52f91d889a2c2a0f9e0b5e97fa7be8b584834016 (diff) | |
| download | kernel_samsung_aries-36c97064196c4549f7f5353fdce970d62b4795f9.zip kernel_samsung_aries-36c97064196c4549f7f5353fdce970d62b4795f9.tar.gz kernel_samsung_aries-36c97064196c4549f7f5353fdce970d62b4795f9.tar.bz2 | |
Merge remote-tracking branch 'common/android-3.0' into android-samsung-30-wip-mergedown
* common/android-3.0: (49 commits)
Linux 3.0.31
hfsplus: Fix potential buffer overflows
sched: Fix nohz load accounting -- again!
wl1251: fix crash on remove due to leftover work item
wl1251: fix crash on remove due to premature kfree
rtlwifi: Fix oops on unload
mac80211: fix AP mode EAP tx for VLAN stations
ipw2200: Fix race condition in the command completion acknowledge
i2c: pnx: Disable clk in suspend
libata: skip old error history when counting probe trials
hwmon: (coretemp) fix oops on cpu unplug
hwmon: (coretemp) Increase CPU core limit
efivars: Improve variable validation
efi: Validate UEFI boot variables
efivars: fix warnings when CONFIG_PSTORE=n
efivars: String functions
efi: Add new variable attributes
SCSI: libsas: fix false positive 'device attached' conditions
SCSI: libsas: fix sas_find_bcast_phy() in the presence of 'vacant' phys
ARM: 7403/1: tls: remove covert channel via TPIDRURW
...
Diffstat (limited to 'drivers/usb/gadget/f_mass_storage.c')
| -rw-r--r-- | drivers/usb/gadget/f_mass_storage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index 1944ebb..7405647 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -2189,7 +2189,7 @@ unknown_cmnd: common->data_size_from_cmnd = 0; sprintf(unknown, "Unknown x%02x", common->cmnd[0]); reply = check_command(common, common->cmnd_size, - DATA_DIR_UNKNOWN, 0xff, 0, unknown); + DATA_DIR_UNKNOWN, ~0, 0, unknown); if (reply == 0) { common->curlun->sense_data = SS_INVALID_COMMAND; reply = -EINVAL; |