diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 23:59:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 23:59:51 -0800 |
| commit | 39769961b842895bddecbae7d823e894a6a11d17 (patch) | |
| tree | 8e8d3227c01fa99ca8e5ba680ee266d6f88b7f3b /drivers/input/joydev.c | |
| parent | a914dd8b3b9ee9ccb2659b55fc98933c9f2a9c73 (diff) | |
v2.5.1.6 -> v2.5.1.7
- Jeff Garzik: fix up loop and md for struct kdev_t typechecking
- Jeff Garzik: improved old-tulip network driver
- Arnaldo: more scsi driver bio updates
- Kai Germaschewski: ISDN updates
- various: kdev_t updates
Diffstat (limited to 'drivers/input/joydev.c')
| -rw-r--r-- | drivers/input/joydev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index be18380e8cf7..f17165bddc0a 100644 --- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c @@ -189,7 +189,7 @@ static int joydev_release(struct inode * inode, struct file * file) static int joydev_open(struct inode *inode, struct file *file) { struct joydev_list *list; - int i = MINOR(inode->i_rdev) - JOYDEV_MINOR_BASE; + int i = minor(inode->i_rdev) - JOYDEV_MINOR_BASE; if (i >= JOYDEV_MINORS || !joydev_table[i]) return -ENODEV; |