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: 9b504750923cb ("ARM: davinci: da8xx: Add USB PHY platform device")
Signed-off-by: David Lechner <da...@lechnology.com>
---
arch/arm/mach-davinci/usb-da8xx.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-davinci/usb-da8xx.c
b/arch/arm/mach-davinci/usb-da8xx.c
index 4d89d86..67d634b 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,
@@ -37,14 +39,14 @@ static struct platform_device da8xx_usb_phy = {
*/
.init_name = "da8xx-usb-phy",
},
+ .dev = {
+ .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);
}
--
2.7.4
