3 files changed, 3 insertions, 4 deletions

diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index a360215dbce7..2568640430fb 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -3331,7 +3331,7 @@ static int DAC960_process_queue(DAC960_Controller_T *Controller, struct request_
                 Command->DmaDirection = PCI_DMA_TODEVICE;
                 Command->CommandType = DAC960_WriteCommand;
         }
-        Command->Completion = Request->waiting;
+        Command->Completion = Request->end_io_data;
         Command->LogicalDriveNumber = (long)Request->rq_disk->private_data;
         Command->BlockNumber = Request->sector;
         Command->BlockCount = Request->nr_sectors;
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index 12ff1a274d91..500d2ebb41e4 100644
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -722,11 +722,10 @@ static int pd_special_command(struct pd_unit *disk,
         rq.rq_status = RQ_ACTIVE;
         rq.rq_disk = disk->gd;
         rq.ref_count = 1;
-        rq.waiting = &wait;
+        rq.end_io_data = &wait;
         rq.end_io = blk_end_sync_rq;
         blk_insert_request(disk->gd->queue, &rq, 0, func);
         wait_for_completion(&wait);
-        rq.waiting = NULL;
         if (rq.errors)
                 err = -EIO;
         blk_put_request(&rq);
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 42891d2b054e..888d1aceeeff 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -375,7 +375,7 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command *
         rq->cmd_len = COMMAND_SIZE(rq->cmd[0]);
 
         rq->ref_count++;
-        rq->waiting = &wait;
+        rq->end_io_data = &wait;
         rq->end_io = blk_end_sync_rq;
         elv_add_request(q, rq, ELEVATOR_INSERT_BACK, 1);
         generic_unplug_device(q);