summaryrefslogtreecommitdiffstats
path: root/drivers/usb/chipidea
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2012-09-12 13:58:02 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-12 19:58:38 +0200
commitc9d1f947a85e38b6dded469470c95ed62430cb3f (patch)
tree9ab1a8de6228bdda0f2345f82e7446eafa13d38f /drivers/usb/chipidea
parentusb: chipidea: udc: add pullup fuction, needed by the uvc gadget (diff)
downloadlinux-c9d1f947a85e38b6dded469470c95ed62430cb3f.tar.xz
linux-c9d1f947a85e38b6dded469470c95ed62430cb3f.zip
usb: chipidea: udc: fix error path in udc_start()
This patch fixes the error path of udc_start(). Now NULL is used to unset the peripheral with otg_set_peripheral(). Cc: stable <stable@vger.kernel.org> Reviewed-by: Richard Zhao <richard.zhao@freescale.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/chipidea')
-rw-r--r--drivers/usb/chipidea/udc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index 32ee8701e199..3a755e5160cf 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -1748,7 +1748,7 @@ static int udc_start(struct ci13xxx *ci)
remove_trans:
if (!IS_ERR_OR_NULL(ci->transceiver)) {
- otg_set_peripheral(ci->transceiver->otg, &ci->gadget);
+ otg_set_peripheral(ci->transceiver->otg, NULL);
if (ci->global_phy)
usb_put_phy(ci->transceiver);
}