diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-22 14:15:59 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-22 14:15:59 -0500 |
commit | 8ff546b801e5cca0337c0f0a7234795d0a6309a1 (patch) | |
tree | fbda2c8e8e5aa9b82d389091f7945e28cdb67418 /drivers/usb/storage/sddr09.c | |
parent | ca78d3173cff3503bcd15723b049757f75762d15 (diff) | |
parent | 0df8a3dbacb585bb9c8b2e55de43c6aac9d86488 (diff) |
Merge tag 'usb-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB/PHY updates from Greg KH:
"Here is the big USB and PHY driver updates for 4.11-rc1.
Nothing major, just the normal amount of churn in the usb gadget and
dwc and xhci controllers, new device ids, new phy drivers, a new
usb-serial driver, and a few other minor changes in different USB
drivers.
All have been in linux-next for a long time with no reported issues"
* tag 'usb-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (265 commits)
usb: cdc-wdm: remove logically dead code
USB: serial: keyspan: drop header file
USB: serial: io_edgeport: drop io-tables header file
usb: musb: add code comment for clarification
usb: misc: add USB251xB/xBi Hi-Speed Hub Controller Driver
usb: misc: usbtest: remove redundant check on retval < 0
USB: serial: upd78f0730: sort device ids
USB: serial: upd78f0730: add ID for EVAL-ADXL362Z
ohci-hub: fix typo in dbg_port macro
usb: musb: dsps: Manage CPPI 4.1 DMA interrupt in DSPS
usb: musb: tusb6010: Clean up tusb_omap_dma structure
usb: musb: cppi_dma: Clean up cppi41_dma_controller structure
usb: musb: cppi_dma: Clean up cppi structure
usb: musb: cppi41: Detect aborted transfers in cppi41_dma_callback()
usb: musb: dma: Add a DMA completion platform callback
drivers: usb: usbip: Add missing break statement to switch
usb: mtu3: remove redundant dev_err call in get_ssusb_rscs()
USB: serial: mos7840: fix another NULL-deref at open
USB: serial: console: clean up sanity checks
USB: serial: console: fix uninitialised spinlock
...
Diffstat (limited to 'drivers/usb/storage/sddr09.c')
-rw-r--r-- | drivers/usb/storage/sddr09.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/storage/sddr09.c b/drivers/usb/storage/sddr09.c index 3aeaa536c44f..44f8ffccd031 100644 --- a/drivers/usb/storage/sddr09.c +++ b/drivers/usb/storage/sddr09.c | |||
@@ -870,13 +870,12 @@ sddr09_write_lba(struct us_data *us, unsigned int lba, | |||
870 | unsigned int pagelen; | 870 | unsigned int pagelen; |
871 | unsigned char *bptr, *cptr, *xptr; | 871 | unsigned char *bptr, *cptr, *xptr; |
872 | unsigned char ecc[3]; | 872 | unsigned char ecc[3]; |
873 | int i, result, isnew; | 873 | int i, result; |
874 | 874 | ||
875 | lbap = ((lba % 1000) << 1) | 0x1000; | 875 | lbap = ((lba % 1000) << 1) | 0x1000; |
876 | if (parity[MSB_of(lbap) ^ LSB_of(lbap)]) | 876 | if (parity[MSB_of(lbap) ^ LSB_of(lbap)]) |
877 | lbap ^= 1; | 877 | lbap ^= 1; |
878 | pba = info->lba_to_pba[lba]; | 878 | pba = info->lba_to_pba[lba]; |
879 | isnew = 0; | ||
880 | 879 | ||
881 | if (pba == UNDEF) { | 880 | if (pba == UNDEF) { |
882 | pba = sddr09_find_unused_pba(info, lba); | 881 | pba = sddr09_find_unused_pba(info, lba); |
@@ -887,7 +886,6 @@ sddr09_write_lba(struct us_data *us, unsigned int lba, | |||
887 | } | 886 | } |
888 | info->pba_to_lba[pba] = lba; | 887 | info->pba_to_lba[pba] = lba; |
889 | info->lba_to_pba[lba] = pba; | 888 | info->lba_to_pba[lba] = pba; |
890 | isnew = 1; | ||
891 | } | 889 | } |
892 | 890 | ||
893 | if (pba == 1) { | 891 | if (pba == 1) { |