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