linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / cdrom / aztcd.c

diff --git a/drivers/cdrom/aztcd.c b/drivers/cdrom/aztcd.c
index ec46949..ce4a1ce 100644 (file)
--- a/drivers/cdrom/aztcd.c
+++ b/drivers/cdrom/aztcd.c
@@ -1763,7 +1763,7 @@ static int __init aztcd_init(void)
                                release_region(azt_port, 4);
                        }
                }
-               if ((i == 16) || (azt_port_auto[i] == 0)) {
+               if ((azt_port_auto[i] == 0) || (i == 16)) {
                        printk(KERN_INFO "aztcd: no AZTECH CD-ROM drive found\n");
                        return -EIO;
                }
@@ -1918,6 +1918,7 @@ static int __init aztcd_init(void)
        azt_disk->first_minor = 0;
        azt_disk->fops = &azt_fops;
        sprintf(azt_disk->disk_name, "aztcd");
+       sprintf(azt_disk->devfs_name, "aztcd");
        azt_disk->queue = azt_queue;
        add_disk(azt_disk);
        azt_invalidate_buffers();