Merge branch 'for-2.6.32' into for-2.6.33

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 747a5e5c1276..040f751809ea 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1708,11 +1708,6 @@ static int sg_finish_rem_req(Sg_request * srp)
         Sg_scatter_hold *req_schp = &srp->data;
 
         SCSI_LOG_TIMEOUT(4, printk("sg_finish_rem_req: res_used=%d\n", (int) srp->res_used));
-        if (srp->res_used)
-                sg_unlink_reserve(sfp, srp);
-        else
-                sg_remove_scat(req_schp);
-
         if (srp->rq) {
                 if (srp->bio)
                         ret = blk_rq_unmap_user(srp->bio);
@@ -1720,6 +1715,11 @@ static int sg_finish_rem_req(Sg_request * srp)
                 blk_put_request(srp->rq);
         }
 
+        if (srp->res_used)
+                sg_unlink_reserve(sfp, srp);
+        else
+                sg_remove_scat(req_schp);
+
         sg_remove_request(sfp, srp);
 
         return ret;