1 files changed, 5 insertions, 8 deletions

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index efcbcd182863..96af195224f2 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -737,16 +737,14 @@ static int sd_setup_discard_cmnd(struct scsi_device *sdp, struct request *rq)
                 goto out;
         }
 
+        rq->completion_data = page;
         blk_add_request_payload(rq, page, len);
         ret = scsi_setup_blk_pc_cmnd(sdp, rq);
-        rq->buffer = page_address(page);
         rq->__data_len = nr_bytes;
 
 out:
-        if (ret != BLKPREP_OK) {
+        if (ret != BLKPREP_OK)
                 __free_page(page);
-                rq->buffer = NULL;
-        }
         return ret;
 }
 
@@ -842,10 +840,9 @@ static void sd_unprep_fn(struct request_queue *q, struct request *rq)
 {
         struct scsi_cmnd *SCpnt = rq->special;
 
-        if (rq->cmd_flags & REQ_DISCARD) {
-                free_page((unsigned long)rq->buffer);
-                rq->buffer = NULL;
-        }
+        if (rq->cmd_flags & REQ_DISCARD)
+                __free_page(rq->completion_data);
+
         if (SCpnt->cmnd != rq->cmd) {
                 mempool_free(SCpnt->cmnd, sd_cdb_pool);
                 SCpnt->cmnd = NULL;