leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
This commit is contained in:
Marek Vasut 2010-09-03 22:35:46 +02:00 committed by Eric Miao
parent 884646a572
commit a754aea25e
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-pxa/pxa3xx-ulpi.c
View File

@ -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)
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();