diff options
Diffstat (limited to 'drivers/input/joystick/interact.c')
| -rw-r--r-- | drivers/input/joystick/interact.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/input/joystick/interact.c b/drivers/input/joystick/interact.c index fec8b3d0967d..1aec1e9d7c59 100644 --- a/drivers/input/joystick/interact.c +++ b/drivers/input/joystick/interact.c | |||
| @@ -185,7 +185,7 @@ static void interact_poll(struct gameport *gameport) | |||
| 185 | 185 | ||
| 186 | static int interact_open(struct input_dev *dev) | 186 | static int interact_open(struct input_dev *dev) |
| 187 | { | 187 | { |
| 188 | struct interact *interact = dev->private; | 188 | struct interact *interact = input_get_drvdata(dev); |
| 189 | 189 | ||
| 190 | gameport_start_polling(interact->gameport); | 190 | gameport_start_polling(interact->gameport); |
| 191 | return 0; | 191 | return 0; |
| @@ -197,7 +197,7 @@ static int interact_open(struct input_dev *dev) | |||
| 197 | 197 | ||
| 198 | static void interact_close(struct input_dev *dev) | 198 | static void interact_close(struct input_dev *dev) |
| 199 | { | 199 | { |
| 200 | struct interact *interact = dev->private; | 200 | struct interact *interact = input_get_drvdata(dev); |
| 201 | 201 | ||
| 202 | gameport_stop_polling(interact->gameport); | 202 | gameport_stop_polling(interact->gameport); |
| 203 | } | 203 | } |
| @@ -262,7 +262,9 @@ static int interact_connect(struct gameport *gameport, struct gameport_driver *d | |||
| 262 | input_dev->id.vendor = GAMEPORT_ID_VENDOR_INTERACT; | 262 | input_dev->id.vendor = GAMEPORT_ID_VENDOR_INTERACT; |
| 263 | input_dev->id.product = interact_type[i].id; | 263 | input_dev->id.product = interact_type[i].id; |
| 264 | input_dev->id.version = 0x0100; | 264 | input_dev->id.version = 0x0100; |
| 265 | input_dev->private = interact; | 265 | input_dev->dev.parent = &gameport->dev; |
| 266 | |||
| 267 | input_set_drvdata(input_dev, interact); | ||
| 266 | 268 | ||
| 267 | input_dev->open = interact_open; | 269 | input_dev->open = interact_open; |
| 268 | input_dev->close = interact_close; | 270 | input_dev->close = interact_close; |
