diff options
| author | Jens Axboe <axboe@kernel.dk> | 2012-07-31 05:47:36 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-07-31 05:47:36 -0400 |
| commit | 10af8138eb6d09d6a768e43ef1aa9b2f16b8c7be (patch) | |
| tree | e3768640b2a002b45e07f5d8a8795d51c2f35652 /drivers/block | |
| parent | 74018dc3063a2c729fc73041c0a9f03aac995920 (diff) | |
| parent | 2fb2ca6f5b953192d5a94fcc778d9abba06462df (diff) | |
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')
| -rw-r--r-- | drivers/block/floppy.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 8d4afc83e05f..a7d6347aaa79 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c | |||
| @@ -2517,8 +2517,7 @@ static int make_raw_rw_request(void) | |||
| 2517 | set_fdc((long)current_req->rq_disk->private_data); | 2517 | set_fdc((long)current_req->rq_disk->private_data); |
| 2518 | 2518 | ||
| 2519 | raw_cmd = &default_raw_cmd; | 2519 | raw_cmd = &default_raw_cmd; |
| 2520 | raw_cmd->flags = FD_RAW_SPIN | FD_RAW_NEED_DISK | FD_RAW_NEED_DISK | | 2520 | raw_cmd->flags = FD_RAW_SPIN | FD_RAW_NEED_DISK | FD_RAW_NEED_SEEK; |
| 2521 | FD_RAW_NEED_SEEK; | ||
| 2522 | raw_cmd->cmd_count = NR_RW; | 2521 | raw_cmd->cmd_count = NR_RW; |
| 2523 | if (rq_data_dir(current_req) == READ) { | 2522 | if (rq_data_dir(current_req) == READ) { |
| 2524 | raw_cmd->flags |= FD_RAW_READ; | 2523 | raw_cmd->flags |= FD_RAW_READ; |