summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-04-30 17:24:10 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-07 08:53:24 -0700
commit174c50cdb6104cb3c3bc1f4ff00ad20881ab00b7 (patch)
treea8cf048faf5f43be48c0f6b7f426450069beb9a6
parent8d46d2d5b370506514616dd64d4e1b836ad4469f (diff)
USB: ehci-tegra: remove redundant gpio_set_value
commit 04c235c92ce8474e9f2b358bd97f013a500385f2 upstream. The immediately preceding gpio_direction_output() already set the value, so there's no need to repeat it. This also prevents gpio_set_value() from WARNing when the GPIO is sleepable (e.g. is on an I2C expander); the set direction API is always sleepable, but plain set_value isn't. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/host/ehci-tegra.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index dbc7fe8ca9e7..de36b8c66626 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -601,7 +601,6 @@ static int setup_vbus_gpio(struct platform_device *pdev)
dev_err(&pdev->dev, "can't enable vbus\n");
return err;
}
- gpio_set_value(gpio, 1);
return err;
}