diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2020-12-14 23:01:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-02-10 09:29:11 +0100 |
| commit | 4bcb395a7f67e9408fd57e487bb016afcdef531d (patch) | |
| tree | 2667f7dea2d8c1719c14b05f9b611865fb14a049 | |
| parent | f808da6bc6e4569987db4c124da5cf92b956c619 (diff) | |
| download | linux-stable-4bcb395a7f67e9408fd57e487bb016afcdef531d.tar.gz linux-stable-4bcb395a7f67e9408fd57e487bb016afcdef531d.tar.bz2 linux-stable-4bcb395a7f67e9408fd57e487bb016afcdef531d.zip | |
ARM: OMAP1: OSK: fix ohci-omap breakage
[ Upstream commit 6efac0173cd15460b48c91e1b0a000379f341f00 ]
Commit 45c5775460f3 ("usb: ohci-omap: Fix descriptor conversion") tried to
fix all issues related to ohci-omap descriptor conversion, but a wrong
patch was applied, and one needed change to the OSK board file is still
missing. Fix that.
Fixes: 45c5775460f3 ("usb: ohci-omap: Fix descriptor conversion")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
[aaro.koskinen@iki.fi: rebased and updated the changelog]
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | arch/arm/mach-omap1/board-osk.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index a720259099ed..0a4c9b0b13b0 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c @@ -203,6 +203,8 @@ static int osk_tps_setup(struct i2c_client *client, void *context) */ gpio_request(OSK_TPS_GPIO_USB_PWR_EN, "n_vbus_en"); gpio_direction_output(OSK_TPS_GPIO_USB_PWR_EN, 1); + /* Free the GPIO again as the driver will request it */ + gpio_free(OSK_TPS_GPIO_USB_PWR_EN); /* Set GPIO 2 high so LED D3 is off by default */ tps65010_set_gpio_out_value(GPIO2, HIGH); |