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 /drivers/cdrom/cm206.c | |
| parent | e4d0251c6f56ab2e191afb70f80f382793e23f74 (diff) | |
Merge with 2.3.47. Guys, this is buggy as shit. You've been warned.
Diffstat (limited to 'drivers/cdrom/cm206.c')
| -rw-r--r-- | drivers/cdrom/cm206.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c index e600d81d0..05aff4b59 100644 --- a/drivers/cdrom/cm206.c +++ b/drivers/cdrom/cm206.c @@ -187,6 +187,7 @@ History: #include <linux/interrupt.h> #include <linux/timer.h> #include <linux/cdrom.h> +#include <linux/devfs_fs_kernel.h> #include <linux/ioport.h> #include <linux/mm.h> #include <linux/malloc.h> @@ -816,7 +817,7 @@ static void do_cm206_request(request_queue_t * q) while(1) { /* repeat until all requests have been satisfied */ INIT_REQUEST; - if (CURRENT == NULL || CURRENT->rq_status == RQ_INACTIVE) + if (QUEUE_EMPTY || CURRENT->rq_status == RQ_INACTIVE) return; if (CURRENT->cmd != READ) { debug(("Non-read command %d on cdrom\n", CURRENT->cmd)); @@ -1277,7 +1278,7 @@ static void cleanup(int level) printk("Can't unregister cdrom cm206\n"); return; } - if (unregister_blkdev(MAJOR_NR, "cm206")) { + if (devfs_unregister_blkdev(MAJOR_NR, "cm206")) { printk("Can't unregister major cm206\n"); return; } @@ -1390,7 +1391,7 @@ int __init cm206_init(void) return -EIO; } printk(".\n"); - if (register_blkdev(MAJOR_NR, "cm206", &cdrom_fops) != 0) { + if (devfs_register_blkdev(MAJOR_NR, "cm206", &cdrom_fops) != 0) { printk(KERN_INFO "Cannot register for major %d!\n", MAJOR_NR); cleanup(3); return -EIO; |