1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index 531af9ed7199..54fa1e42dc4d 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -1937,7 +1937,11 @@ int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
         if (ret > 0) {
                 /* positive number is the untransferred residual */
                 rsp->resid_len = ret;
+                req->resid_len = 0;
                 ret = 0;
+        } else if (ret == 0) {
+                rsp->resid_len = 0;
+                req->resid_len = 0;
         }
 
         return ret;