diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-29 01:11:23 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-29 01:11:23 -0400 |
| commit | 7b7e394185014e0f3bd8989cac937003f20ef9ce (patch) | |
| tree | 3beda5f979bba0aa9822534e239cf1b45f3be69c /drivers/cdrom/aztcd.c | |
| parent | ddc5d3414593e4d7ad7fbd33e7f7517fcc234544 (diff) | |
| parent | 693f7d362055261882659475d2ef022e32edbff1 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/cdrom/aztcd.c')
| -rw-r--r-- | drivers/cdrom/aztcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cdrom/aztcd.c b/drivers/cdrom/aztcd.c index ce4a1ce59d6a..ec004897b634 100644 --- a/drivers/cdrom/aztcd.c +++ b/drivers/cdrom/aztcd.c | |||
| @@ -1763,7 +1763,7 @@ static int __init aztcd_init(void) | |||
| 1763 | release_region(azt_port, 4); | 1763 | release_region(azt_port, 4); |
| 1764 | } | 1764 | } |
| 1765 | } | 1765 | } |
| 1766 | if ((azt_port_auto[i] == 0) || (i == 16)) { | 1766 | if ((i == 16) || (azt_port_auto[i] == 0)) { |
| 1767 | printk(KERN_INFO "aztcd: no AZTECH CD-ROM drive found\n"); | 1767 | printk(KERN_INFO "aztcd: no AZTECH CD-ROM drive found\n"); |
| 1768 | return -EIO; | 1768 | return -EIO; |
| 1769 | } | 1769 | } |