diff options
| author | David Lechner <david@lechnology.com> | 2018-03-15 15:17:20 -0400 |
|---|---|---|
| committer | Sekhar Nori <nsekhar@ti.com> | 2018-03-29 02:48:32 -0400 |
| commit | 3424a516d9d2d3fa45c63750c15ea2bba893ea81 (patch) | |
| tree | 94dfb6af1f4793d297e5f258f2c30dbef4e34691 | |
| parent | 96c081735d5197d9d4fa0b6ce84cffa3bb197474 (diff) | |
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>
| -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 @@ | |||
| 26 | 26 | ||
| 27 | static struct clk *usb20_clk; | 27 | static struct clk *usb20_clk; |
| 28 | 28 | ||
| 29 | static struct da8xx_usb_phy_platform_data da8xx_usb_phy_pdata; | ||
| 30 | |||
| 29 | static struct platform_device da8xx_usb_phy = { | 31 | static struct platform_device da8xx_usb_phy = { |
| 30 | .name = "da8xx-usb-phy", | 32 | .name = "da8xx-usb-phy", |
| 31 | .id = -1, | 33 | .id = -1, |
| @@ -36,15 +38,13 @@ static struct platform_device da8xx_usb_phy = { | |||
| 36 | * registered yet. | 38 | * registered yet. |
| 37 | */ | 39 | */ |
| 38 | .init_name = "da8xx-usb-phy", | 40 | .init_name = "da8xx-usb-phy", |
| 41 | .platform_data = &da8xx_usb_phy_pdata, | ||
| 39 | }, | 42 | }, |
| 40 | }; | 43 | }; |
| 41 | 44 | ||
| 42 | int __init da8xx_register_usb_phy(void) | 45 | int __init da8xx_register_usb_phy(void) |
| 43 | { | 46 | { |
| 44 | struct da8xx_usb_phy_platform_data pdata; | 47 | da8xx_usb_phy_pdata.cfgchip = da8xx_get_cfgchip(); |
| 45 | |||
| 46 | pdata.cfgchip = da8xx_get_cfgchip(); | ||
| 47 | da8xx_usb_phy.dev.platform_data = &pdata; | ||
| 48 | 48 | ||
| 49 | return platform_device_register(&da8xx_usb_phy); | 49 | return platform_device_register(&da8xx_usb_phy); |
| 50 | } | 50 | } |
