|
@@ -497,22 +497,23 @@ static int __init i2c_imx_probe(struct platform_device *pdev)
|
|
|
}
|
|
|
|
|
|
res_size = resource_size(res);
|
|
|
+
|
|
|
+ if (!request_mem_region(res->start, res_size, DRIVER_NAME)) {
|
|
|
+ ret = -EBUSY;
|
|
|
+ goto fail0;
|
|
|
+ }
|
|
|
+
|
|
|
base = ioremap(res->start, res_size);
|
|
|
if (!base) {
|
|
|
dev_err(&pdev->dev, "ioremap failed\n");
|
|
|
ret = -EIO;
|
|
|
- goto fail0;
|
|
|
+ goto fail1;
|
|
|
}
|
|
|
|
|
|
i2c_imx = kzalloc(sizeof(struct imx_i2c_struct), GFP_KERNEL);
|
|
|
if (!i2c_imx) {
|
|
|
dev_err(&pdev->dev, "can't allocate interface\n");
|
|
|
ret = -ENOMEM;
|
|
|
- goto fail1;
|
|
|
- }
|
|
|
-
|
|
|
- if (!request_mem_region(res->start, res_size, DRIVER_NAME)) {
|
|
|
- ret = -EBUSY;
|
|
|
goto fail2;
|
|
|
}
|
|
|
|
|
@@ -583,11 +584,11 @@ fail5:
|
|
|
fail4:
|
|
|
clk_put(i2c_imx->clk);
|
|
|
fail3:
|
|
|
- release_mem_region(i2c_imx->res->start, resource_size(res));
|
|
|
-fail2:
|
|
|
kfree(i2c_imx);
|
|
|
-fail1:
|
|
|
+fail2:
|
|
|
iounmap(base);
|
|
|
+fail1:
|
|
|
+ release_mem_region(res->start, resource_size(res));
|
|
|
fail0:
|
|
|
if (pdata && pdata->exit)
|
|
|
pdata->exit(&pdev->dev);
|
|
@@ -619,8 +620,8 @@ static int __exit i2c_imx_remove(struct platform_device *pdev)
|
|
|
|
|
|
clk_put(i2c_imx->clk);
|
|
|
|
|
|
- release_mem_region(i2c_imx->res->start, resource_size(i2c_imx->res));
|
|
|
iounmap(i2c_imx->base);
|
|
|
+ release_mem_region(i2c_imx->res->start, resource_size(i2c_imx->res));
|
|
|
kfree(i2c_imx);
|
|
|
return 0;
|
|
|
}
|