diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-06 20:23:44 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-06 20:23:44 -0700 |
| commit | 07176b988ebb20f46a317a60ee1d983fe1630203 (patch) | |
| tree | e54affb1f823742078c68d9506e6035016bc2ea4 /drivers/input/joystick | |
| parent | fa46c7984092f3dbdbb3bcd7338d81a1168d9d2b (diff) | |
| parent | 52764fed5049655926bcecaefd52f0a415ceb105 (diff) | |
Merge branch 'next' into for-linus
Merge first round of changes for 3.12 merge window.
Diffstat (limited to 'drivers/input/joystick')
| -rw-r--r-- | drivers/input/joystick/as5011.c | 3 | ||||
| -rw-r--r-- | drivers/input/joystick/maplecontrol.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/input/joystick/as5011.c b/drivers/input/joystick/as5011.c index 121cd63d333..005d852a06e 100644 --- a/drivers/input/joystick/as5011.c +++ b/drivers/input/joystick/as5011.c @@ -234,7 +234,7 @@ static int as5011_probe(struct i2c_client *client, int irq; int error; - plat_data = client->dev.platform_data; + plat_data = dev_get_platdata(&client->dev); if (!plat_data) return -EINVAL; @@ -288,6 +288,7 @@ static int as5011_probe(struct i2c_client *client, if (irq < 0) { dev_err(&client->dev, "Failed to get irq number for button gpio\n"); + error = irq; goto err_free_button_gpio; } diff --git a/drivers/input/joystick/maplecontrol.c b/drivers/input/joystick/maplecontrol.c index 59c10ec5a2a..8aa6e4c497d 100644 --- a/drivers/input/joystick/maplecontrol.c +++ b/drivers/input/joystick/maplecontrol.c @@ -61,7 +61,7 @@ static void dc_pad_callback(struct mapleq *mq) static int dc_pad_open(struct input_dev *dev) { - struct dc_pad *pad = dev->dev.platform_data; + struct dc_pad *pad = dev_get_platdata(&dev->dev); maple_getcond_callback(pad->mdev, dc_pad_callback, HZ/20, MAPLE_FUNC_CONTROLLER); @@ -71,7 +71,7 @@ static int dc_pad_open(struct input_dev *dev) static void dc_pad_close(struct input_dev *dev) { - struct dc_pad *pad = dev->dev.platform_data; + struct dc_pad *pad = dev_get_platdata(&dev->dev); maple_getcond_callback(pad->mdev, dc_pad_callback, 0, MAPLE_FUNC_CONTROLLER); |