diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-22 22:47:04 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-22 22:47:04 -0500 |
| commit | ca5f73a05ebfbf74ea9874d5eaad8d63d7e69b4f (patch) | |
| tree | ff48e1162f66528b579d2eb60cec6c871a165797 /drivers/gpio | |
| parent | 97dbf37d89b6d387a5fe79ffe3b72c37ec12db43 (diff) | |
| parent | b93cef556162b0f33399bfe5f307c54f51554e09 (diff) | |
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.c | 2 |
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) | |||
| 135 | struct rdc321x_gpio *rdc321x_gpio_dev; | 135 | struct rdc321x_gpio *rdc321x_gpio_dev; |
| 136 | struct rdc321x_gpio_pdata *pdata; | 136 | struct rdc321x_gpio_pdata *pdata; |
| 137 | 137 | ||
| 138 | pdata = pdev->dev.platform_data; | 138 | pdata = platform_get_drvdata(pdev); |
| 139 | if (!pdata) { | 139 | if (!pdata) { |
| 140 | dev_err(&pdev->dev, "no platform data supplied\n"); | 140 | dev_err(&pdev->dev, "no platform data supplied\n"); |
| 141 | return -ENODEV; | 141 | return -ENODEV; |