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

…git/jikos/floppy into for-3.6/drivers
Sandbox-125 · Jul 31, 2012 · 10af813 · 10af813
2 parents 74018dc + 2fb2ca6
commit 10af813
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
@@ -2517,8 +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;