From fd79583dcbb9ff900211a7fdb283c2436717bdd0 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Tue, 15 Jul 2008 21:21:43 +0200 Subject: [PATCH] --- yaml --- r: 101199 b: refs/heads/master c: 6fe162381e547f457252e68521eb42fd36ec1418 h: refs/heads/master i: 101197: fba3d5246c0a86b6260444d5ba10b057f6504d72 101195: 310bf393a694c8b2eadf8a51eef53120b676a40a 101191: 4d113efbfe0f98e46019e664324d63595337e712 101183: f64d41842db71cd9d0fe98b8ddc06ad077a68baf v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-floppy.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index cc0fe39d8270..eb3ee90c339c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd47087bc173a84e8c42644b315d38b30dc02263 +refs/heads/master: 6fe162381e547f457252e68521eb42fd36ec1418 diff --git a/trunk/drivers/ide/ide-floppy.c b/trunk/drivers/ide/ide-floppy.c index 7d75240c2e26..b10e9a813cde 100644 --- a/trunk/drivers/ide/ide-floppy.c +++ b/trunk/drivers/ide/ide-floppy.c @@ -887,14 +887,16 @@ static ide_startstop_t idefloppy_do_request(ide_drive_t *drive, static int idefloppy_queue_pc_tail(ide_drive_t *drive, struct ide_atapi_pc *pc) { struct ide_floppy_obj *floppy = drive->driver_data; - struct request rq; + struct request *rq; + int error; - ide_init_drive_cmd(&rq); - rq.buffer = (char *) pc; - rq.cmd_type = REQ_TYPE_SPECIAL; - rq.rq_disk = floppy->disk; + rq = blk_get_request(drive->queue, READ, __GFP_WAIT); + rq->buffer = (char *) pc; + rq->cmd_type = REQ_TYPE_SPECIAL; + error = blk_execute_rq(drive->queue, floppy->disk, rq, 0); + blk_put_request(rq); - return ide_do_drive_cmd(drive, &rq, ide_wait); + return error; } /*