fanghuilin / rpms / kernel

Forked from rpms/kernel 3 years ago
Clone
a8a466
From 5c528134dc5242845930c8eb33abd97bb0ef5bc2 Mon Sep 17 00:00:00 2001
a8a466
From: Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>
a8a466
Date: Wed, 26 Oct 2016 13:34:32 +0530
a8a466
Subject: [PATCH 01/11] scsi: mpt3sas: Fix for improper info displayed in var
a8a466
 log, while blocking or unblocking the device.
a8a466
a8a466
Return value and Device_handle Arguments passed in correct order
a8a466
 to match with its format string.
a8a466
a8a466
Signed-off-by: Chaitra P B <chaitra.basappa@broadcom.com>
a8a466
Signed-off-by: Sathya Prakash <sathya.prakash@broadcom.com>
a8a466
Signed-off-by: Suganath Prabu S <suganath-prabu.subramani@broadcom.com>
a8a466
Reviewed-by: Hannes Reinecke <hare@suse.com>
a8a466
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
a8a466
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
a8a466
---
a8a466
 drivers/scsi/mpt3sas/mpt3sas_scsih.c | 8 ++++----
a8a466
 1 file changed, 4 insertions(+), 4 deletions(-)
a8a466
a8a466
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
a8a466
index 1911152..9c61476 100644
a8a466
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
a8a466
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
a8a466
@@ -2888,7 +2888,7 @@ _scsih_internal_device_block(struct scsi_device *sdev,
a8a466
 	if (r == -EINVAL)
a8a466
 		sdev_printk(KERN_WARNING, sdev,
a8a466
 		    "device_block failed with return(%d) for handle(0x%04x)\n",
a8a466
-		    sas_device_priv_data->sas_target->handle, r);
a8a466
+		    r, sas_device_priv_data->sas_target->handle);
a8a466
 }
a8a466
 
a8a466
 /**
a8a466
@@ -2918,20 +2918,20 @@ _scsih_internal_device_unblock(struct scsi_device *sdev,
a8a466
 		sdev_printk(KERN_WARNING, sdev,
a8a466
 		    "device_unblock failed with return(%d) for handle(0x%04x) "
a8a466
 		    "performing a block followed by an unblock\n",
a8a466
-		    sas_device_priv_data->sas_target->handle, r);
a8a466
+		    r, sas_device_priv_data->sas_target->handle);
a8a466
 		sas_device_priv_data->block = 1;
a8a466
 		r = scsi_internal_device_block(sdev);
a8a466
 		if (r)
a8a466
 			sdev_printk(KERN_WARNING, sdev, "retried device_block "
a8a466
 			    "failed with return(%d) for handle(0x%04x)\n",
a8a466
-			    sas_device_priv_data->sas_target->handle, r);
a8a466
+			    r, sas_device_priv_data->sas_target->handle);
a8a466
 
a8a466
 		sas_device_priv_data->block = 0;
a8a466
 		r = scsi_internal_device_unblock(sdev, SDEV_RUNNING);
a8a466
 		if (r)
a8a466
 			sdev_printk(KERN_WARNING, sdev, "retried device_unblock"
a8a466
 			    " failed with return(%d) for handle(0x%04x)\n",
a8a466
-			    sas_device_priv_data->sas_target->handle, r);
a8a466
+			    r, sas_device_priv_data->sas_target->handle);
a8a466
 	}
a8a466
 }
a8a466
 
a8a466
-- 
a8a466
1.8.3.1
a8a466