Skip to content

Commit

Permalink
usb: ehci-sh: fix illegal phy_init() running when platform_data is NULL
Browse files Browse the repository at this point in the history
If the platform_data is not set, pdata will be uninitialized value.
Since the driver has the following code, if the condition is true when
the pdata is uninitialized value, the driver may jump to the illegal
phy_init().

	if (pdata && pdata->phy_init)
		pdata->phy_init();

This patch also fixes the following warning:

  CC      drivers/usb/host/ehci-hcd.o
drivers/usb/host/ehci-sh.c: In function ‘ehci_hcd_sh_probe’:
drivers/usb/host/ehci-sh.c:104: warning: ‘pdata’ may be used uninitialized in this function

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Shimoda, Yoshihiro authored and Greg Kroah-Hartman committed Jun 15, 2012
1 parent 6c4707f commit 5897b03
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/usb/host/ehci-sh.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,7 @@ static int ehci_hcd_sh_probe(struct platform_device *pdev)
goto fail_create_hcd;
}

if (pdev->dev.platform_data != NULL)
pdata = pdev->dev.platform_data;
pdata = pdev->dev.platform_data;

/* initialize hcd */
hcd = usb_create_hcd(&ehci_sh_hc_driver, &pdev->dev,
Expand Down

0 comments on commit 5897b03

Please sign in to comment.