Skip to contentSkip to conversation

rdc321x-gpio: fix null pointer dereference while accessing platform_data

PATCH In review Florian Fainelli 3 participants 3 messages Nov 26, 2010 – Nov 29, 2010 GPIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 rdc321x-gpio: fix null pointer dereference while accessing platform_data

rdc321x-gpio currently fetches its driver specific data by using the platform_ device->platform_data pointer, this is wrong because the mfd device which registers our platform_device has been added using mfd_add_device() which sets the platform_device->driver_data pointer instead.

---
This patch should be applied for the next 2.6.36 stable release.

drivers/gpio/rdc321x-gpio.c +1 -1
index 2762698..897e057 100644
@@ -135,7 +135,7 @@ static int __devinit rdc321x_gpio_probe(struct platform_device *pdev)
 	struct rdc321x_gpio *rdc321x_gpio_dev;
 	struct rdc321x_gpio_pdata *pdata;
 
-	pdata = pdev->dev.platform_data;
+	pdata = platform_get_drvdata(pdev);
 	if (!pdata) {
 		dev_err(&pdev->dev, "no platform data supplied\n");
 		return -ENODEV;
#1 lore raw

Hi Florian,

Quoted 7 lines · Florian Fainelli

rdc321x-gpio currently fetches its driver specific data by using the platform_ device->platform_data pointer, this is wrong because the mfd device which registers our platform_device has been added using mfd_add_device() which sets the platform_device->driver_data pointer instead.

I'll take those 2 patches.

Cheers,
Samuel.

Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/
#2 lore raw

Hi Samuel, Florian,

You also have my ACK for the watchdog driver.

Kind regards,
Wim.

Quoted 18 lines

Hi Florian,

Quoted 7 lines · Florian Fainelli

rdc321x-gpio currently fetches its driver specific data by using the platform_ device->platform_data pointer, this is wrong because the mfd device which registers our platform_device has been added using mfd_add_device() which sets the platform_device->driver_data pointer instead.

I'll take those 2 patches.

Cheers,
Samuel.

Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/