提交 a754aea2 编写于 作者: M Marek Vasut 提交者: Eric Miao

ARM: pxa: fix pxa3xx-u2d crash when ULPI not used

In case the pxa3xx-u2d driver isn't used, probing of ohci-pxa27x will cause an
ugly kernel crash (NULL pointer dereference in pxa3xx_u2d_start_hc(), because
struct u2d is NULL and clk_enable() call will crash the kernel, trying to access
it).
Signed-off-by: NMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: NEric Miao <eric.y.miao@gmail.com>
上级 884646a5
...@@ -252,6 +252,10 @@ int pxa3xx_u2d_start_hc(struct usb_bus *host) ...@@ -252,6 +252,10 @@ int pxa3xx_u2d_start_hc(struct usb_bus *host)
{ {
int err = 0; int err = 0;
/* In case the PXA3xx ULPI isn't used, do nothing. */
if (!u2d)
return 0;
clk_enable(u2d->clk); clk_enable(u2d->clk);
if (cpu_is_pxa310()) { if (cpu_is_pxa310()) {
...@@ -264,6 +268,10 @@ int pxa3xx_u2d_start_hc(struct usb_bus *host) ...@@ -264,6 +268,10 @@ int pxa3xx_u2d_start_hc(struct usb_bus *host)
void pxa3xx_u2d_stop_hc(struct usb_bus *host) void pxa3xx_u2d_stop_hc(struct usb_bus *host)
{ {
/* In case the PXA3xx ULPI isn't used, do nothing. */
if (!u2d)
return;
if (cpu_is_pxa310()) if (cpu_is_pxa310())
pxa310_stop_otg_hc(); pxa310_stop_otg_hc();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册