git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
cdrom
/
aztcd.c
diff --git
a/drivers/cdrom/aztcd.c
b/drivers/cdrom/aztcd.c
index
43bf1e5
..
ec00489
100644
(file)
--- a/
drivers/cdrom/aztcd.c
+++ b/
drivers/cdrom/aztcd.c
@@
-297,7
+297,7
@@
static char azt_auto_eject = AZT_AUTO_EJECT;
static int AztTimeout, AztTries;
static DECLARE_WAIT_QUEUE_HEAD(azt_waitq);
static int AztTimeout, AztTries;
static DECLARE_WAIT_QUEUE_HEAD(azt_waitq);
-static
struct timer_list delay_timer = TIMER_INITIALIZER(
NULL, 0, 0);
+static
DEFINE_TIMER(delay_timer,
NULL, 0, 0);
static struct azt_DiskInfo DiskInfo;
static struct azt_Toc Toc[MAX_TRACKS];
static struct azt_DiskInfo DiskInfo;
static struct azt_Toc Toc[MAX_TRACKS];
@@
-1763,7
+1763,7
@@
static int __init aztcd_init(void)
release_region(azt_port, 4);
}
}
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;
}
printk(KERN_INFO "aztcd: no AZTECH CD-ROM drive found\n");
return -EIO;
}