aboutsummaryrefslogtreecommitdiff
path: root/drivers/block/floppy.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2012-07-31 11:47:36 +0200
committerJens Axboe <axboe@kernel.dk>2012-07-31 11:47:36 +0200
commit10af8138eb6d09d6a768e43ef1aa9b2f16b8c7be (patch)
treee3768640b2a002b45e07f5d8a8795d51c2f35652 /drivers/block/floppy.c
parent74018dc3063a2c729fc73041c0a9f03aac995920 (diff)
parent2fb2ca6f5b953192d5a94fcc778d9abba06462df (diff)
downloadlinux-10af8138eb6d09d6a768e43ef1aa9b2f16b8c7be.tar.gz
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy into for-3.6/drivers
Diffstat (limited to 'drivers/block/floppy.c')
-rw-r--r--drivers/block/floppy.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 8d4afc83e05..a7d6347aaa7 100644
--- 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;