pcmcia: omap: Fix error return code in omap_cf_probe()
authorWang ShaoBo <bobo.shaobowang@huawei.com>
Wed, 25 Nov 2020 12:50:57 +0000 (20:50 +0800)
committerDominik Brodowski <linux@dominikbrodowski.net>
Sat, 5 Dec 2020 08:59:13 +0000 (09:59 +0100)
Fix to return proper error code instaed of 0 in omap_cf_probe(), as done
elsewhere in this function.

Signed-off-by: Wang ShaoBo <bobo.shaobowang@huawei.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
drivers/pcmcia/omap_cf.c

index d3ef553..f0b2c2d 100644 (file)
@@ -252,11 +252,15 @@ static int __init omap_cf_probe(struct platform_device *pdev)
        /* pcmcia layer only remaps "real" memory */
        cf->socket.io_offset = (unsigned long)
                        ioremap(cf->phys_cf + SZ_4K, SZ_2K);
-       if (!cf->socket.io_offset)
+       if (!cf->socket.io_offset) {
+               status = -ENOMEM;
                goto fail1;
+       }
 
-       if (!request_mem_region(cf->phys_cf, SZ_8K, driver_name))
+       if (!request_mem_region(cf->phys_cf, SZ_8K, driver_name)) {
+               status = -ENXIO;
                goto fail1;
+       }
 
        /* NOTE:  CF conflicts with MMC1 */
        omap_cfg_reg(W11_1610_CF_CD1);