Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10af8138 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'upstream' of... 

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

drivers/block/floppy.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -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;