summaryrefslogtreecommitdiffstats
path: root/drivers/gpio
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-22 19:47:04 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-22 19:47:04 -0800
commitca5f73a05ebfbf74ea9874d5eaad8d63d7e69b4f (patch)
treeff48e1162f66528b579d2eb60cec6c871a165797 /drivers/gpio
parent97dbf37d89b6d387a5fe79ffe3b72c37ec12db43 (diff)
parentb93cef556162b0f33399bfe5f307c54f51554e09 (diff)
downloadlinux-ca5f73a05ebfbf74ea9874d5eaad8d63d7e69b4f.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: mfd: Support additional parent IDs for wm831x mfd: Fix ab8500-core interrupt ffs bit bug mfd: Supply IRQ base for WM832x devices watchdog: Fix null pointer dereference while accessing rdc321x platform_data gpio: Fix null pointer dereference while accessing rdc321x platform_data
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/rdc321x-gpio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/rdc321x-gpio.c b/drivers/gpio/rdc321x-gpio.c
index 2762698e0204..897e0577e65e 100644
--- a/drivers/gpio/rdc321x-gpio.c
+++ b/drivers/gpio/rdc321x-gpio.c
@@ -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;