Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy...

diff --combined drivers/block/floppy.c
index 8d4afc83e05fc52bc7db069f9911154c0fca914f,9d6ef68e2f1b4433f705d846bd536a47cdaf92d4..a7d6347aaa7913b2a029014a95a2558d8360597e
--- 1/drivers/block/floppy.c
--- 2/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@@ -672,7 -672,6 +672,7 @@@ static void __reschedule_timeout(int dr
  
        if (drive == current_reqD)
                drive = current_drive;
 +      __cancel_delayed_work(&fd_timeout);
  
        if (drive < 0 || drive >= N_DRIVE) {
                delay = 20UL * HZ;
@@@ -2517,8 -2516,7 +2517,7 @@@ static int make_raw_rw_request(void
        set_fdc((long)current_req->rq_disk->private_data);
  
        raw_cmd = &default_raw_cmd;
-       raw_cmd->flags = FD_RAW_SPIN | FD_RAW_NEED_DISK | FD_RAW_NEED_DISK |
-           FD_RAW_NEED_SEEK;
+       raw_cmd->flags = FD_RAW_SPIN | FD_RAW_NEED_DISK | FD_RAW_NEED_SEEK;
        raw_cmd->cmd_count = NR_RW;
        if (rq_data_dir(current_req) == READ) {
                raw_cmd->flags |= FD_RAW_READ;