Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4927fbf1 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Ben Dooks
Browse files

i2c: imx: call ioremap only after request_mem_region 



accordingly adapt order of release_mem_region and release_mem_region on
remove.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Wolfram Sang <w.sang@pengutronix.de>
Cc: Richard Zhao <linuxzsc@gmail.com>
Cc: Darius Augulis <augulis.darius@gmail.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: linux-i2c@vger.kernel.org
Acked-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent a1ee06b7

drivers/i2c/busses/i2c-imx.c

+11 −10
Original line number Diff line number Diff line
@@ -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 @@ static int __init i2c_imx_probe(struct platform_device *pdev) 
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;

}