Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 04:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Wang ShaoBo 2020-11-25 20:50:57 +08:00 committed by Dominik Brodowski
parent ea2c5ac866
commit 70d3a462fc
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/pcmcia/omap_cf.c
View File

@ -252,11 +252,15 @@ static int __init omap_cf_probe(struct platform_device *pdev)
/* pcmcia layer only remaps "real" memory */ /* pcmcia layer only remaps "real" memory */
cf->socket.io_offset = (unsigned long) cf->socket.io_offset = (unsigned long)
ioremap(cf->phys_cf + SZ_4K, SZ_2K); ioremap(cf->phys_cf + SZ_4K, SZ_2K);
if (!cf->socket.io_offset) if (!cf->socket.io_offset) {
status = -ENOMEM;
goto fail1; 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; goto fail1;
}
/* NOTE: CF conflicts with MMC1 */ /* NOTE: CF conflicts with MMC1 */
omap_cfg_reg(W11_1610_CF_CD1); omap_cfg_reg(W11_1610_CF_CD1);