diff options
Diffstat (limited to 'linux/dev/drivers')
| -rw-r--r-- | linux/dev/drivers/block/floppy.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/linux/dev/drivers/block/floppy.c b/linux/dev/drivers/block/floppy.c index d297e61..83943ee 100644 --- a/linux/dev/drivers/block/floppy.c +++ b/linux/dev/drivers/block/floppy.c @@ -1413,7 +1413,7 @@ static int interpret_errors(void) */ static void setup_rw_floppy(void) { - int i,ready_date,r, flags,dflags; + int i, ready_date, r, flags; timeout_fn function; flags = raw_cmd->flags; @@ -1436,7 +1436,6 @@ static void setup_rw_floppy(void) if (wait_for_completion(ready_date,function)) return; } - dflags = DRS->flags; if ((flags & FD_RAW_READ) || (flags & FD_RAW_WRITE)) setup_DMA(); @@ -4276,11 +4275,10 @@ void cleanup_module(void) * resource contention. */ void floppy_eject(void) { - int dummy; if(floppy_grab_irq_and_dma()==0) { lock_fdc(MAXTIMEOUT,0); - dummy=fd_eject(0); + fd_eject(0); process_fd_request(); floppy_release_irq_and_dma(); } |