diff options
Diffstat (limited to 'drivers/cdrom/cdu31a.c')
| -rw-r--r-- | drivers/cdrom/cdu31a.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/cdrom/cdu31a.c b/drivers/cdrom/cdu31a.c index 24e7a5c26..0b8d942b4 100644 --- a/drivers/cdrom/cdu31a.c +++ b/drivers/cdrom/cdu31a.c @@ -162,6 +162,7 @@ #include <linux/hdreg.h> #include <linux/genhd.h> #include <linux/ioport.h> +#include <linux/devfs_fs_kernel.h> #include <linux/string.h> #include <linux/malloc.h> #include <linux/init.h> @@ -1672,7 +1673,7 @@ do_cdu31a_request(request_queue_t * q) if (signal_pending(current)) { restore_flags(flags); - if (CURRENT && CURRENT->rq_status != RQ_INACTIVE) + if (!QUEUE_EMPTY && CURRENT->rq_status != RQ_INACTIVE) { end_request(0); } @@ -1705,7 +1706,7 @@ cdu31a_request_startover: * The beginning here is stolen from the hard disk driver. I hope * it's right. */ - if (!(CURRENT) || CURRENT->rq_status == RQ_INACTIVE) + if (QUEUE_EMPTY || CURRENT->rq_status == RQ_INACTIVE) { goto end_do_cdu31a_request; } @@ -3441,7 +3442,7 @@ cdu31a_init(void) request_region(cdu31a_port, 4,"cdu31a"); - if (register_blkdev(MAJOR_NR,"cdu31a",&cdrom_fops)) + if (devfs_register_blkdev(MAJOR_NR,"cdu31a",&cdrom_fops)) { printk("Unable to get major %d for CDU-31a\n", MAJOR_NR); goto errout2; @@ -3543,7 +3544,7 @@ cdu31a_init(void) } errout0: printk("Unable to register CDU-31a with Uniform cdrom driver\n"); - if (unregister_blkdev(MAJOR_NR, "cdu31a")) + if (devfs_unregister_blkdev(MAJOR_NR, "cdu31a")) { printk("Can't unregister block device for cdu31a\n"); } @@ -3562,7 +3563,7 @@ cdu31a_exit(void) printk("Can't unregister cdu31a from Uniform cdrom driver\n"); return; } - if ((unregister_blkdev(MAJOR_NR, "cdu31a") == -EINVAL)) + if ((devfs_unregister_blkdev(MAJOR_NR, "cdu31a") == -EINVAL)) { printk("Can't unregister cdu31a\n"); return; |