Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a754aea2 authored by Marek Vasut's avatar Marek Vasut Committed by Eric Miao
Browse files

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: default avatarMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 884646a5

arch/arm/mach-pxa/pxa3xx-ulpi.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -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();