Skip to content

Commit

Permalink
ARM: pxa: fix pxa3xx-u2d crash when ULPI not used
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Marek Vasut authored and Eric Miao committed Oct 8, 2010
1 parent 884646a commit a754aea
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions arch/arm/mach-pxa/pxa3xx-ulpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,10 @@ int pxa3xx_u2d_start_hc(struct usb_bus *host)
{
int err = 0;

/* In case the PXA3xx ULPI isn't used, do nothing. */
if (!u2d)
return 0;

clk_enable(u2d->clk);

if (cpu_is_pxa310()) {
Expand All @@ -264,6 +268,10 @@ int pxa3xx_u2d_start_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())
pxa310_stop_otg_hc();

Expand Down

0 comments on commit a754aea

Please sign in to comment.