diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-05-09 15:01:11 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:15:05 +0200 |
| commit | d7a544ad56863bde4c0088e2b0d6cf623a6bd31f (patch) | |
| tree | 649740c447ecf2a51597ac8713f3e1ec5c967312 /arch/arm | |
| parent | 0af8cd2e079abf3f1f0e63cf1e7c2d30cf692a93 (diff) | |
usb : storage : remove incorrect setting length
It is incorrect to set short_not_ok when preparing
the request to receive CBW.CBW will be a short-packet
so short_not_ok must not be set.
Mass-storage and file-storage gadgets align the length
to maximum-packet-size when preparing the request to
receive CBW. This is unnecessary and prevents the
controller driver from knowing that a short-packet
is expected.
ST-Ericsson ID: 275473
ST-Ericsson Linux next: 275473
ST-Ericsson FOSS-OUT ID: NA
Change-Id: I0d0116f72337c86fcd8861aa8c3a53afc4d84f7e
Signed-off-by: Mian Yousaf <mian.yousaf.kaukab@stericsson.com>
Signed-off-by: rajaram <rajaram.ragupathy@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/20303
Tested-by: Rajaram REGUPATHY <ragupathy.rajaram@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Reviewed-by: Praveena NADAHALLY <praveen.nadahally@stericsson.com>
Conflicts:
drivers/usb/gadget/f_mass_storage.c
drivers/usb/gadget/file_storage.c
drivers/usb/gadget/storage_common.c
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-ux500/Makefile | 3 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/regulator-db8500.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile index 3c192562073..2bd2818c6cf 100644 --- a/arch/arm/mach-ux500/Makefile +++ b/arch/arm/mach-ux500/Makefile @@ -11,7 +11,7 @@ obj-$(CONFIG_UX500_SOC_DB5500) += cpu-db5500.o dma-db5500.o prcmu-db5500.o \ clock-debug.o obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o devices-db8500.o \ prcmu-db8500.o clock-db8500.o \ - regulator-db8500.o timer-rtt.o + timer-rtt.o obj-$(CONFIG_MACH_U8500) += board-mop500.o board-mop500-sdi.o \ board-mop500-regulators.o \ board-mop500-uib.o board-mop500-stuib.o \ @@ -30,6 +30,7 @@ obj-$(CONFIG_TEE_SVP) += tee_service_svp.o obj-$(CONFIG_TEE_SVP) += tee_ta_start_modem_svp.o obj-$(CONFIG_DB8500_MLOADER) += mloader-db8500.o obj-$(CONFIG_UX500_PRCMU_TIMER) += timer-prcmu.o +obj-$(CONFIG_REGULATOR) += regulator-db8500.o obj-$(CONFIG_U8500_REGULATOR_DEBUG) += virt-regulator-u8500.o obj-$(CONFIG_UX500_PRCMU_DEBUG) += prcmu-debug.o obj-$(CONFIG_UX500_PRCMU_QOS_POWER) += prcmu-qos-power.o diff --git a/arch/arm/mach-ux500/regulator-db8500.c b/arch/arm/mach-ux500/regulator-db8500.c index eebd3cf9d44..b52530daabe 100644 --- a/arch/arm/mach-ux500/regulator-db8500.c +++ b/arch/arm/mach-ux500/regulator-db8500.c @@ -144,6 +144,8 @@ void ux500_regulator_put(struct ux500_regulator *regulator) /* Here for symetric reasons and for possible future use */ } +#ifdef CONFIG_UX500_SOC_DB8500 + /** * struct db8500_regulator_info - db8500 regulator information * @dev: device pointer @@ -644,3 +646,5 @@ module_exit(db8500_regulator_exit); MODULE_AUTHOR("STMicroelectronics/ST-Ericsson"); MODULE_DESCRIPTION("DB8500 regulator driver"); MODULE_LICENSE("GPL v2"); + +#endif /* CONFIG_UX500_SOC_DB8500 */ |