diff options
Diffstat (limited to 'drivers/block/swim3.c')
| -rw-r--r-- | drivers/block/swim3.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c index e5f7494c00ee..e425ad3eebba 100644 --- a/drivers/block/swim3.c +++ b/drivers/block/swim3.c | |||
| @@ -834,8 +834,7 @@ static int fd_eject(struct floppy_state *fs) | |||
| 834 | break; | 834 | break; |
| 835 | } | 835 | } |
| 836 | swim3_select(fs, RELAX); | 836 | swim3_select(fs, RELAX); |
| 837 | current->state = TASK_INTERRUPTIBLE; | 837 | schedule_timeout_interruptible(1); |
| 838 | schedule_timeout(1); | ||
| 839 | if (swim3_readbit(fs, DISK_IN) == 0) | 838 | if (swim3_readbit(fs, DISK_IN) == 0) |
| 840 | break; | 839 | break; |
| 841 | } | 840 | } |
| @@ -906,8 +905,7 @@ static int floppy_open(struct inode *inode, struct file *filp) | |||
| 906 | break; | 905 | break; |
| 907 | } | 906 | } |
| 908 | swim3_select(fs, RELAX); | 907 | swim3_select(fs, RELAX); |
| 909 | current->state = TASK_INTERRUPTIBLE; | 908 | schedule_timeout_interruptible(1); |
| 910 | schedule_timeout(1); | ||
| 911 | } | 909 | } |
| 912 | if (err == 0 && (swim3_readbit(fs, SEEK_COMPLETE) == 0 | 910 | if (err == 0 && (swim3_readbit(fs, SEEK_COMPLETE) == 0 |
| 913 | || swim3_readbit(fs, DISK_IN) == 0)) | 911 | || swim3_readbit(fs, DISK_IN) == 0)) |
| @@ -992,8 +990,7 @@ static int floppy_revalidate(struct gendisk *disk) | |||
| 992 | if (signal_pending(current)) | 990 | if (signal_pending(current)) |
| 993 | break; | 991 | break; |
| 994 | swim3_select(fs, RELAX); | 992 | swim3_select(fs, RELAX); |
| 995 | current->state = TASK_INTERRUPTIBLE; | 993 | schedule_timeout_interruptible(1); |
| 996 | schedule_timeout(1); | ||
| 997 | } | 994 | } |
| 998 | ret = swim3_readbit(fs, SEEK_COMPLETE) == 0 | 995 | ret = swim3_readbit(fs, SEEK_COMPLETE) == 0 |
| 999 | || swim3_readbit(fs, DISK_IN) == 0; | 996 | || swim3_readbit(fs, DISK_IN) == 0; |