[2/3] scsi: myrs: Fix the processor absent message in processor_show()

Commit Message

Dan Carpenter Oct. 19, 2018, 9:18 a.m. UTC

If both processors are absent then it's supposed to print that, but
instead we print that just the second processor is absent.

Fixes: 77266186397c ("scsi: myrs: Add Mylex RAID controller (SCSI interface)")
Signed-off-by: Dan Carpenter <[e-mail]>
---
 drivers/scsi/myrs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Martin K. Petersen Oct. 19, 2018, 11:01 p.m. UTC | #1

Dan,

> If both processors are absent then it's supposed to print that, but
> instead we print that just the second processor is absent.

Applied to 4.20/scsi-queue.

Patch

diff --git a/drivers/scsi/myrs.c b/drivers/scsi/myrs.c
index b02ee0b0dd55..07e5a3f54e31 100644
--- a/drivers/scsi/myrs.c
+++ b/drivers/scsi/myrs.c
@@ -1366,11 +1366,11 @@  static ssize_t processor_show(struct device *dev,
 			       first_processor, info->cpu[0].cpu_count,
 			       info->cpu[1].cpu_name,
 			       second_processor, info->cpu[1].cpu_count);
-	else if (!second_processor)
+	else if (first_processor && !second_processor)
 		ret = snprintf(buf, 64, "1: %s (%s, %d cpus)\n2: absent\n",
 			       info->cpu[0].cpu_name,
 			       first_processor, info->cpu[0].cpu_count);
-	else if (!first_processor)
+	else if (!first_processor && second_processor)
 		ret = snprintf(buf, 64, "1: absent\n2: %s (%s, %d cpus)\n",
 			       info->cpu[1].cpu_name,
 			       second_processor, info->cpu[1].cpu_count);