diff options
Diffstat (limited to 'drivers/scsi/sg.c')
-rw-r--r-- | drivers/scsi/sg.c | 10 |
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) | |||
1708 | Sg_scatter_hold *req_schp = &srp->data; | 1708 | Sg_scatter_hold *req_schp = &srp->data; |
1709 | 1709 | ||
1710 | SCSI_LOG_TIMEOUT(4, printk("sg_finish_rem_req: res_used=%d\n", (int) srp->res_used)); | 1710 | SCSI_LOG_TIMEOUT(4, printk("sg_finish_rem_req: res_used=%d\n", (int) srp->res_used)); |
1711 | if (srp->res_used) | ||
1712 | sg_unlink_reserve(sfp, srp); | ||
1713 | else | ||
1714 | sg_remove_scat(req_schp); | ||
1715 | |||
1716 | if (srp->rq) { | 1711 | if (srp->rq) { |
1717 | if (srp->bio) | 1712 | if (srp->bio) |
1718 | ret = blk_rq_unmap_user(srp->bio); | 1713 | ret = blk_rq_unmap_user(srp->bio); |
@@ -1720,6 +1715,11 @@ static int sg_finish_rem_req(Sg_request * srp) | |||
1720 | blk_put_request(srp->rq); | 1715 | blk_put_request(srp->rq); |
1721 | } | 1716 | } |
1722 | 1717 | ||
1718 | if (srp->res_used) | ||
1719 | sg_unlink_reserve(sfp, srp); | ||
1720 | else | ||
1721 | sg_remove_scat(req_schp); | ||
1722 | |||
1723 | sg_remove_request(sfp, srp); | 1723 | sg_remove_request(sfp, srp); |
1724 | 1724 | ||
1725 | return ret; | 1725 | return ret; |