qed: Fix overriding of supported autoneg value.

[mirror_ubuntu-bionic-kernel.git] / drivers / parisc / ccio-dma.c

diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index aeb073b5fe1606475a615054c58e02060627cec9..e32ca2ef9e54047cd527cd32f3667103de8d4a40 100644 (file)
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -1539,7 +1539,7 @@ static int __init ccio_probe(struct parisc_device *dev)
        ioc = kzalloc(sizeof(struct ioc), GFP_KERNEL);
        if (ioc == NULL) {
                printk(KERN_ERR MODULE_NAME ": memory allocation failure\n");
-               return 1;
+               return -ENOMEM;
        }
 
        ioc->name = dev->id.hversion == U2_IOA_RUNWAY ? "U2" : "UTurn";
@@ -1554,6 +1554,10 @@ static int __init ccio_probe(struct parisc_device *dev)
 
        ioc->hw_path = dev->hw_path;
        ioc->ioc_regs = ioremap_nocache(dev->hpa.start, 4096);
+       if (!ioc->ioc_regs) {
+               kfree(ioc);
+               return -ENOMEM;
+       }
        ccio_ioc_init(ioc);
        ccio_init_resources(ioc);
        hppa_dma_ops = &ccio_ops;