Signed-off-by: Nick Cheng< nick.cheng@xxxxxxxxxxxx > -----Original Message----- From: NickCheng [mailto:nick.cheng@xxxxxxxxxxxx] Sent: Wednesday, June 20, 2012 9:38 AM To: 'James Bottomley' Cc: 'linux-scsi@xxxxxxxxxxxxxxx'; 'linux-kernel@xxxxxxxxxxxxxxx' Subject: RE: [Fwd: [patch] [SCSI] arcmsr: fix misuse of | instead of &] Hi James, Sorry for be late response. I am OK with it. -----Original Message----- From: James Bottomley [mailto:James.Bottomley@xxxxxxxxxxxxxxxxxxxxx] Sent: Tuesday, June 19, 2012 11:57 PM To: Nick Cheng Subject: [Fwd: [patch] [SCSI] arcmsr: fix misuse of | instead of &] Is this OK with you? James -------- Forwarded Message -------- From: Dan Carpenter <dan.carpenter@xxxxxxxxxx> To: James E.J. Bottomley <JBottomley@xxxxxxxxxxxxx> Cc: David Howells <dhowells@xxxxxxxxxx>, Nick Cheng <nick.cheng@xxxxxxxxxxxx>, , kernel-janitors@xxxxxxxxxxxxxxx Subject: [patch] [SCSI] arcmsr: fix misuse of | instead of & Date: Sat, 9 Jun 2012 12:10:19 +0300 ARCMSR_ARC1880_DiagWrite_ENABLE is 0x00000080 so (x | 0x00000080) is never zero. The intent here was to test that loop until ARCMSR_ARC1880_DiagWrite_ENABLE was turned on, but because the test was wrong, we would do five loops regardless of whether it succeed or not. Also I simplified the condition a little by removing the unused assignement. Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx> --- Static checker stuff. I do not own this hardware. diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c index cbde1dc..def24a1 100644 --- a/drivers/scsi/arcmsr/arcmsr_hba.c +++ b/drivers/scsi/arcmsr/arcmsr_hba.c @@ -2821,7 +2821,7 @@ static void arcmsr_hardware_reset(struct AdapterControlBlock *acb) int i, count = 0; struct MessageUnit_A __iomem *pmuA = acb->pmuA; struct MessageUnit_C __iomem *pmuC = acb->pmuC; - u32 temp = 0; + /* backup pci config data */ printk(KERN_NOTICE "arcmsr%d: executing hw bus reset .....\n", acb->host->host_no); for (i = 0; i < 64; i++) { @@ -2839,7 +2839,7 @@ static void arcmsr_hardware_reset(struct AdapterControlBlock *acb) writel(0x2, &pmuC->write_sequence); writel(0x7, &pmuC->write_sequence); writel(0xD, &pmuC->write_sequence); - } while ((((temp = readl(&pmuC->host_diagnostic)) | ARCMSR_ARC1880_DiagWrite_ENABLE) == 0) && (count < 5)); + } while (((readl(&pmuC->host_diagnostic) & ARCMSR_ARC1880_DiagWrite_ENABLE) == 0) && (count < 5)); writel(ARCMSR_ARC1880_RESET_ADAPTER, &pmuC->host_diagnostic); } else { pci_write_config_byte(acb->pdev, 0x84, 0x20); -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
