ignatenkobrain / rpms / kernel

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