summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2012-09-12 14:58:02 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-02 10:40:02 -0700
commitb739070c21f7279c4e508d4af7c5752b345966cb (patch)
tree48255caac025d93b4eea62a30cc435fc60a9bbe8
parent647aac2b3cc4016aeb62b0952e90065fdff595ea (diff)
usb: chipidea: udc: fix error path in udc_start()
commit c9d1f947a85e38b6dded469470c95ed62430cb3f upstream. 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>
-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 6486d5ec1947..90d9f43da325 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -1747,7 +1747,7 @@ static int udc_start(struct ci13xxx *udc)
remove_trans:
if (udc->transceiver) {
- otg_set_peripheral(udc->transceiver->otg, &udc->gadget);
+ otg_set_peripheral(udc->transceiver->otg, NULL);
usb_put_transceiver(udc->transceiver);
}