43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
From 00b9a1f97dbdfbdc1d268bf8d878937b150ce2d4 Mon Sep 17 00:00:00 2001
|
|
From: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
Date: Sat, 30 Mar 2013 12:53:58 +0200
|
|
Subject: [PATCH] usb: chipidea: usbmisc: fix a potential race condition
|
|
|
|
This fixes a potential race condition where the ci13xxx_imx glue code
|
|
could be fast enough to call one of the usbmisc_ops before he got a
|
|
valid value on the static usbmisc pointer. To fix that we first set
|
|
usbmisc, then call usbmisc_set_ops().
|
|
|
|
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
|
|
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/usb/chipidea/usbmisc_imx.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c
|
|
index fd4d339..d77e712 100644
|
|
--- a/drivers/usb/chipidea/usbmisc_imx.c
|
|
+++ b/drivers/usb/chipidea/usbmisc_imx.c
|
|
@@ -116,14 +116,14 @@ static int usbmisc_imx_probe(struct platform_device *pdev)
|
|
return ret;
|
|
}
|
|
|
|
+ usbmisc = data;
|
|
ret = usbmisc_set_ops(&imx6q_usbmisc_ops);
|
|
if (ret) {
|
|
+ usbmisc = NULL;
|
|
clk_disable_unprepare(data->clk);
|
|
return ret;
|
|
}
|
|
|
|
- usbmisc = data;
|
|
-
|
|
return 0;
|
|
}
|
|
|
|
--
|
|
1.7.9.5
|
|
|