1 files changed, 9 insertions, 6 deletions

diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index e8196c55b633..d314aa5c71cf 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -322,6 +322,7 @@ static int osst_chk_result(struct osst_tape * STp, struct osst_request * SRpnt)
 /* Wakeup from interrupt */
 static void osst_end_async(struct request *req, int update)
 {
+        struct scsi_request *rq = scsi_req(req);
         struct osst_request *SRpnt = req->end_io_data;
         struct osst_tape *STp = SRpnt->stp;
         struct rq_map_data *mdata = &SRpnt->stp->buffer->map_data;
@@ -330,6 +331,8 @@ static void osst_end_async(struct request *req, int update)
 #if DEBUG
         STp->write_pending = 0;
 #endif
+        if (rq->sense_len)
+                memcpy(SRpnt->sense, rq->sense, SCSI_SENSE_BUFFERSIZE);
         if (SRpnt->waiting)
                 complete(SRpnt->waiting);
 
@@ -357,6 +360,7 @@ static int osst_execute(struct osst_request *SRpnt, const unsigned char *cmd,
                         int use_sg, int timeout, int retries)
 {
         struct request *req;
+        struct scsi_request *rq;
         struct page **pages = NULL;
         struct rq_map_data *mdata = &SRpnt->stp->buffer->map_data;
 
@@ -367,7 +371,8 @@ static int osst_execute(struct osst_request *SRpnt, const unsigned char *cmd,
         if (IS_ERR(req))
                 return DRIVER_ERROR << 24;
 
-        blk_rq_set_block_pc(req);
+        rq = scsi_req(req);
+        scsi_req_init(req);
         req->rq_flags |= RQF_QUIET;
 
         SRpnt->bio = NULL;
@@ -404,11 +409,9 @@ static int osst_execute(struct osst_request *SRpnt, const unsigned char *cmd,
                         goto free_req;
         }
 
-        req->cmd_len = cmd_len;
-        memset(req->cmd, 0, BLK_MAX_CDB); /* ATAPI hates garbage after CDB */
-        memcpy(req->cmd, cmd, req->cmd_len);
-        req->sense = SRpnt->sense;
-        req->sense_len = 0;
+        rq->cmd_len = cmd_len;
+        memset(rq->cmd, 0, BLK_MAX_CDB); /* ATAPI hates garbage after CDB */
+        memcpy(rq->cmd, cmd, rq->cmd_len);
         req->timeout = timeout;
         req->retries = retries;
         req->end_io_data = SRpnt;