diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
| commit | 482368b1a8e45430672c58c9a42e7d2004367126 (patch) | |
| tree | ce2a1a567d4d62dee7c2e71a46a99cf72cf1d606 /arch/m68k/atari | |
| parent | e4d0251c6f56ab2e191afb70f80f382793e23f74 (diff) | |
Merge with 2.3.47. Guys, this is buggy as shit. You've been warned.
Diffstat (limited to 'arch/m68k/atari')
| -rw-r--r-- | arch/m68k/atari/joystick.c | 6 | ||||
| -rw-r--r-- | arch/m68k/atari/stram.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/m68k/atari/joystick.c b/arch/m68k/atari/joystick.c index bf82e67ea..86bd24c73 100644 --- a/arch/m68k/atari/joystick.c +++ b/arch/m68k/atari/joystick.c @@ -12,6 +12,7 @@ #include <linux/major.h> #include <linux/poll.h> #include <linux/init.h> +#include <linux/devfs_fs_kernel.h> #include <asm/atarikb.h> #include <asm/atari_joystick.h> @@ -132,8 +133,11 @@ int __init atari_joystick_init(void) init_waitqueue_head(&joystick[0].wait); init_waitqueue_head(&joystick[1].wait); - if (register_chrdev(MAJOR_NR, "Joystick", &atari_joystick_fops)) + if (devfs_register_chrdev(MAJOR_NR, "Joystick", &atari_joystick_fops)) printk("unable to get major %d for joystick devices\n", MAJOR_NR); + devfs_register_series (NULL, "joysticks/digital%u", 2, DEVFS_FL_DEFAULT, + MAJOR_NR, 128, S_IFCHR | S_IRUSR | S_IWUSR, 0, 0, + &atari_joystick_fops, NULL); return 0; } diff --git a/arch/m68k/atari/stram.c b/arch/m68k/atari/stram.c index 77053421e..7406a8d02 100644 --- a/arch/m68k/atari/stram.c +++ b/arch/m68k/atari/stram.c @@ -1168,7 +1168,7 @@ static void do_stram_request( void ) { unsigned long start, len; - while( CURRENT ) { + while( !QUEUE_EMPTY ) { if (MAJOR(CURRENT->rq_dev) != MAJOR_NR) panic("stram: request list destroyed"); if (CURRENT->bh) { |