Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[profile/ivi/kernel-x86-ivi.git] / drivers / crypto / hifn_795x.c

diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
index df14358..fda3296 100644 (file)
--- a/drivers/crypto/hifn_795x.c
+++ b/drivers/crypto/hifn_795x.c
@@ -2611,14 +2611,17 @@ static int __devinit hifn_probe(struct pci_dev *pdev, const struct pci_device_id
                size = pci_resource_len(pdev, i);
 
                dev->bar[i] = ioremap_nocache(addr, size);
-               if (!dev->bar[i])
+               if (!dev->bar[i]) {
+                       err = -ENOMEM;
                        goto err_out_unmap_bars;
+               }
        }
 
        dev->desc_virt = pci_alloc_consistent(pdev, sizeof(struct hifn_dma),
                        &dev->desc_dma);
        if (!dev->desc_virt) {
                dprintk("Failed to allocate descriptor rings.\n");
+               err = -ENOMEM;
                goto err_out_unmap_bars;
        }
        memset(dev->desc_virt, 0, sizeof(struct hifn_dma));