Commit 70d3a462 authored by Wang ShaoBo's avatar Wang ShaoBo Committed by Dominik Brodowski
Browse files

pcmcia: omap: Fix error return code in omap_cf_probe() 



Fix to return proper error code instaed of 0 in omap_cf_probe(), as done
elsewhere in this function.

Signed-off-by: default avatarWang ShaoBo <bobo.shaobowang@huawei.com>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent ea2c5ac8

drivers/pcmcia/omap_cf.c

+6 −2
Original line number Diff line number Diff line
@@ -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);