diff for duplicates of <20120609091018.GC877@elgon.mountain> diff --git a/a/1.txt b/N1/1.txt index 22dac34..3dcf9ff 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,8 +27,8 @@ index cbde1dc..def24a1 100644 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)); +- } 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); diff --git a/a/content_digest b/N1/content_digest index cf5ae83..612ae5d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch] [SCSI] arcmsr: fix misuse of | instead of &\0" - "Date\0Sat, 09 Jun 2012 09:10:19 +0000\0" + "Date\0Sat, 9 Jun 2012 12:10:19 +0300\0" "To\0James E.J. Bottomley <JBottomley@parallels.com>\0" "Cc\0David Howells <dhowells@redhat.com>" Nick Cheng <nick.cheng@areca.com.tw> @@ -38,10 +38,10 @@ " \t\t\twritel(0x2, &pmuC->write_sequence);\n" " \t\t\twritel(0x7, &pmuC->write_sequence);\n" " \t\t\twritel(0xD, &pmuC->write_sequence);\n" - "-\t\t} while ((((temp = readl(&pmuC->host_diagnostic)) | ARCMSR_ARC1880_DiagWrite_ENABLE) = 0) && (count < 5));\n" - "+\t\t} while (((readl(&pmuC->host_diagnostic) & ARCMSR_ARC1880_DiagWrite_ENABLE) = 0) && (count < 5));\n" + "-\t\t} while ((((temp = readl(&pmuC->host_diagnostic)) | ARCMSR_ARC1880_DiagWrite_ENABLE) == 0) && (count < 5));\n" + "+\t\t} while (((readl(&pmuC->host_diagnostic) & ARCMSR_ARC1880_DiagWrite_ENABLE) == 0) && (count < 5));\n" " \t\twritel(ARCMSR_ARC1880_RESET_ADAPTER, &pmuC->host_diagnostic);\n" " \t} else {\n" " \t\tpci_write_config_byte(acb->pdev, 0x84, 0x20);" -92eba48ec1e4ec0acecca1bb753228ff270f6bb2d3fc0c85e81a44d8e761e937 +31d61baf56fb11272dae0d177f5c10c922f894e92f84620405786c8a56d469bd
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.