diff for duplicates of <20100730090604.GY26313@bicker> diff --git a/a/1.txt b/N1/1.txt index 35a10d5..959b4e5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -10,7 +10,7 @@ index acbf0d0..ce587f4 100644 /* Conversion to new PCI API : * Pages are always aligned and zeroed, no need to it ourself. * Doc says should be OK for EISA bus as well - Jean II */ -- if ((lp->page_vaddr_algn = pci_alloc_consistent(lp->pci_dev, MAX_RINGSIZE, &page_baddr)) = NULL) { +- if ((lp->page_vaddr_algn = pci_alloc_consistent(lp->pci_dev, MAX_RINGSIZE, &page_baddr)) == NULL) { + lp->page_vaddr_algn = pci_alloc_consistent(lp->pci_dev, MAX_RINGSIZE, &page_baddr); + if (!lp->page_vaddr_algn) { err = -ENOMEM; diff --git a/a/content_digest b/N1/content_digest index 7d4ce05..723b770 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <error27@gmail.com>\0" "Subject\0[patch] hp100: unmap memory on error path\0" - "Date\0Fri, 30 Jul 2010 09:06:04 +0000\0" + "Date\0Fri, 30 Jul 2010 11:06:04 +0200\0" "To\0Jaroslav Kysela <perex@perex.cz>\0" "Cc\0David S. Miller <davem@davemloft.net>" Jiri Pirko <jpirko@redhat.com> @@ -21,7 +21,7 @@ " \t\t/* Conversion to new PCI API :\n" " \t\t * Pages are always aligned and zeroed, no need to it ourself.\n" " \t\t * Doc says should be OK for EISA bus as well - Jean II */\n" - "-\t\tif ((lp->page_vaddr_algn = pci_alloc_consistent(lp->pci_dev, MAX_RINGSIZE, &page_baddr)) = NULL) {\n" + "-\t\tif ((lp->page_vaddr_algn = pci_alloc_consistent(lp->pci_dev, MAX_RINGSIZE, &page_baddr)) == NULL) {\n" "+\t\tlp->page_vaddr_algn = pci_alloc_consistent(lp->pci_dev, MAX_RINGSIZE, &page_baddr);\n" "+\t\tif (!lp->page_vaddr_algn) {\n" " \t\t\terr = -ENOMEM;\n" @@ -39,4 +39,4 @@ " \t\tiounmap(mem_ptr_virt);\n" out2: -ff4dff24cdecc32b2c15e39bdc47c2fa6655850a4cfc3ae3c6ca3e98c9cb5b8d +e3300c76a511ddf3c4214acd55a57abe60f08ea7910470397aab0e3802c67482
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.