---

yaml
---
r: 101199
b: refs/heads/master
c: 6fe1623
h: refs/heads/master
i:
  101197: fba3d52
  101195: 310bf39
  101191: 4d113ef
  101183: f64d418
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd47087bc173a84e8c42644b315d38b30dc02263
+refs/heads/master: 6fe162381e547f457252e68521eb42fd36ec1418

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;
 }
 
 /*