|
@@ -903,10 +903,14 @@ static void unlock_fdc(void)
|
|
|
}
|
|
|
|
|
|
/* switches the motor off after a given timeout */
|
|
|
-static void motor_off_callback(unsigned long nr)
|
|
|
+static void motor_off_callback(struct timer_list *t)
|
|
|
{
|
|
|
+ unsigned long nr = t - motor_off_timer;
|
|
|
unsigned char mask = ~(0x10 << UNIT(nr));
|
|
|
|
|
|
+ if (WARN_ON_ONCE(nr >= N_DRIVE))
|
|
|
+ return;
|
|
|
+
|
|
|
set_dor(FDC(nr), mask, 0);
|
|
|
}
|
|
|
|
|
@@ -3047,7 +3051,7 @@ static void raw_cmd_done(int flag)
|
|
|
else
|
|
|
raw_cmd->flags &= ~FD_RAW_DISK_CHANGE;
|
|
|
if (raw_cmd->flags & FD_RAW_NO_MOTOR_AFTER)
|
|
|
- motor_off_callback(current_drive);
|
|
|
+ motor_off_callback(&motor_off_timer[current_drive]);
|
|
|
|
|
|
if (raw_cmd->next &&
|
|
|
(!(raw_cmd->flags & FD_RAW_FAILURE) ||
|
|
@@ -4542,7 +4546,7 @@ static int __init do_floppy_init(void)
|
|
|
disks[drive]->fops = &floppy_fops;
|
|
|
sprintf(disks[drive]->disk_name, "fd%d", drive);
|
|
|
|
|
|
- setup_timer(&motor_off_timer[drive], motor_off_callback, drive);
|
|
|
+ timer_setup(&motor_off_timer[drive], motor_off_callback, 0);
|
|
|
}
|
|
|
|
|
|
err = register_blkdev(FLOPPY_MAJOR, "fd");
|