torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy into for-3.6/drivers

Browse Source
This commit is contained in:
Jens Axboe 2012-07-31 11:47:36 +02:00
commit 10af8138eb
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/block/floppy.c
View File

@ -2517,8 +2517,7 @@ static int make_raw_rw_request(void)
set_fdc((long)current_req->rq_disk->private_data); set_fdc((long)current_req->rq_disk->private_data);
raw_cmd = &default_raw_cmd; raw_cmd = &default_raw_cmd;
raw_cmd->flags = FD_RAW_SPIN | FD_RAW_NEED_DISK | FD_RAW_NEED_DISK | raw_cmd->flags = FD_RAW_SPIN | FD_RAW_NEED_DISK | FD_RAW_NEED_SEEK;
FD_RAW_NEED_SEEK;
raw_cmd->cmd_count = NR_RW; raw_cmd->cmd_count = NR_RW;
if (rq_data_dir(current_req) == READ) { if (rq_data_dir(current_req) == READ) {
raw_cmd->flags |= FD_RAW_READ; raw_cmd->flags |= FD_RAW_READ;