diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-08 05:37:51 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-08 05:37:51 +0200 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /drivers/input/joystick/db9.c | |
| parent | [POWERPC] Holly bootwrapper (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| download | linux-02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1.tar.xz linux-02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/input/joystick/db9.c')
| -rw-r--r-- | drivers/input/joystick/db9.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c index b41bd2eb37dd..c27593bf9978 100644 --- a/drivers/input/joystick/db9.c +++ b/drivers/input/joystick/db9.c @@ -518,7 +518,7 @@ static void db9_timer(unsigned long private) static int db9_open(struct input_dev *dev) { - struct db9 *db9 = dev->private; + struct db9 *db9 = input_get_drvdata(dev); struct parport *port = db9->pd->port; int err; @@ -542,7 +542,7 @@ static int db9_open(struct input_dev *dev) static void db9_close(struct input_dev *dev) { - struct db9 *db9 = dev->private; + struct db9 *db9 = input_get_drvdata(dev); struct parport *port = db9->pd->port; mutex_lock(&db9->mutex); @@ -625,7 +625,8 @@ static struct db9 __init *db9_probe(int parport, int mode) input_dev->id.vendor = 0x0002; input_dev->id.product = mode; input_dev->id.version = 0x0100; - input_dev->private = db9; + + input_set_drvdata(input_dev, db9); input_dev->open = db9_open; input_dev->close = db9_close; |