diff options
| author | David Lechner <david@lechnology.com> | 2018-03-15 20:17:20 +0100 |
|---|---|---|
| committer | Sekhar Nori <nsekhar@ti.com> | 2018-03-29 08:48:32 +0200 |
| commit | 3424a516d9d2d3fa45c63750c15ea2bba893ea81 (patch) | |
| tree | 94dfb6af1f4793d297e5f258f2c30dbef4e34691 /arch | |
| parent | ARM: davinci: move davinci_clk_init() to init_time (diff) | |
| download | linux-3424a516d9d2d3fa45c63750c15ea2bba893ea81.tar.xz linux-3424a516d9d2d3fa45c63750c15ea2bba893ea81.zip | |
ARM: davinci: da8xx: fix oops in USB PHY driver due to stack allocated platform_data
This fixes a possible kernel oops due to using stack allocated platform
data for the USB PHY driver on DA8XX devices. If the platform device
probe is deferred, then we get a corrupt pointer for the platform data.
We now use a global static struct for the platform data so that the
platform data pointer does not get written over.
Fixes: bdec5a6b5789 ("ARM: da8xx: use platform data for CFGCHIP syscon regmap")
Signed-off-by: David Lechner <david@lechnology.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-davinci/usb-da8xx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-davinci/usb-da8xx.c b/arch/arm/mach-davinci/usb-da8xx.c index 4d89d86ce7e5..50445f0e98de 100644 --- a/arch/arm/mach-davinci/usb-da8xx.c +++ b/arch/arm/mach-davinci/usb-da8xx.c @@ -26,6 +26,8 @@ static struct clk *usb20_clk; +static struct da8xx_usb_phy_platform_data da8xx_usb_phy_pdata; + static struct platform_device da8xx_usb_phy = { .name = "da8xx-usb-phy", .id = -1, @@ -36,15 +38,13 @@ static struct platform_device da8xx_usb_phy = { * registered yet. */ .init_name = "da8xx-usb-phy", + .platform_data = &da8xx_usb_phy_pdata, }, }; int __init da8xx_register_usb_phy(void) { - struct da8xx_usb_phy_platform_data pdata; - - pdata.cfgchip = da8xx_get_cfgchip(); - da8xx_usb_phy.dev.platform_data = &pdata; + da8xx_usb_phy_pdata.cfgchip = da8xx_get_cfgchip(); return platform_device_register(&da8xx_usb_phy); } |