X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=drivers%2Fcdrom%2Faztcd.c;h=1f9fb7a9670314403d6981166f2544e22ceac9a5;hb=31a7c549eda6bf0a38d8fc12c903a8535a9f27ca;hp=ce4a1ce59d6a2369ee22bbebeca2f4bc62346659;hpb=d58dde0f552a5c5c4485b962d8b6e9dd54fefb30;p=mv-sheeva.git diff --git a/drivers/cdrom/aztcd.c b/drivers/cdrom/aztcd.c index ce4a1ce59d6..1f9fb7a9670 100644 --- a/drivers/cdrom/aztcd.c +++ b/drivers/cdrom/aztcd.c @@ -170,7 +170,6 @@ #include #include -#include #include #include #include @@ -1763,7 +1762,7 @@ static int __init aztcd_init(void) release_region(azt_port, 4); } } - if ((azt_port_auto[i] == 0) || (i == 16)) { + if ((i == 16) || (azt_port_auto[i] == 0)) { printk(KERN_INFO "aztcd: no AZTECH CD-ROM drive found\n"); return -EIO; } @@ -1918,7 +1917,6 @@ 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();