1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index 2403721f9db1..38578b9dbfd1 100644
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -437,7 +437,7 @@ static char *pd_buf;		/* buffer for request in progress */
 
 static enum action do_pd_io_start(void)
 {
-        if (pd_req->flags & REQ_SPECIAL) {
+        if (blk_special_request(pd_req)) {
                 phase = pd_special;
                 return pd_special();
         }
@@ -719,14 +719,12 @@ static int pd_special_command(struct pd_unit *disk,
 
         memset(&rq, 0, sizeof(rq));
         rq.errors = 0;
-        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);