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>

diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index a720259..0a4c9b0 100644 (file)
--- 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);