ignatenkobrain / rpms / kernel

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