projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'stable/for-linus-3.12-rc0-tag-three' of git://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
drivers
/
gpio
/
gpio-adp5520.c
diff --git
a/drivers/gpio/gpio-adp5520.c
b/drivers/gpio/gpio-adp5520.c
index
f33f78d
..
084337d
100644
(file)
--- a/
drivers/gpio/gpio-adp5520.c
+++ b/
drivers/gpio/gpio-adp5520.c
@@
-89,7
+89,7
@@
static int adp5520_gpio_direction_output(struct gpio_chip *chip,
static int adp5520_gpio_probe(struct platform_device *pdev)
{
static int adp5520_gpio_probe(struct platform_device *pdev)
{
- struct adp5520_gpio_platform_data *pdata =
pdev->dev.platform_data
;
+ struct adp5520_gpio_platform_data *pdata =
dev_get_platdata(&pdev->dev)
;
struct adp5520_gpio *dev;
struct gpio_chip *gc;
int ret, i, gpios;
struct adp5520_gpio *dev;
struct gpio_chip *gc;
int ret, i, gpios;