Commit b1c428b6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'i2c-for-5.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fixes from Wolfram Sang:
 "Two I2C driver bugfixes preventing resource leaks"

* tag 'i2c-for-5.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: cadence: Unregister the clk notifier in error path
  i2c: piix4: Fix a memory leak in the EFCH MMIO support
parents d9cdc3b1 3501f0c6

drivers/i2c/busses/i2c-cadence.c

+1 −0
Original line number Diff line number Diff line
@@ -1338,6 +1338,7 @@ static int cdns_i2c_probe(struct platform_device *pdev) 
	return 0;



err_clk_dis:

	clk_notifier_unregister(id->clk, &id->clk_rate_change_nb);

	clk_disable_unprepare(id->clk);

	pm_runtime_disable(&pdev->dev);

	pm_runtime_set_suspended(&pdev->dev);

drivers/i2c/busses/i2c-piix4.c

+7 −9
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ static const char *piix4_aux_port_name_sb800 = " port 1"; 


struct sb800_mmio_cfg {

	void __iomem *addr;

	struct resource *res;

	bool use_mmio;

};
@@ -179,13 +178,11 @@ static int piix4_sb800_region_request(struct device *dev, 
				      struct sb800_mmio_cfg *mmio_cfg)

{

	if (mmio_cfg->use_mmio) {

		struct resource *res;

		void __iomem *addr;



		res = request_mem_region_muxed(SB800_PIIX4_FCH_PM_ADDR,

		if (!request_mem_region_muxed(SB800_PIIX4_FCH_PM_ADDR,

					      SB800_PIIX4_FCH_PM_SIZE,

					       "sb800_piix4_smb");

		if (!res) {

					      "sb800_piix4_smb")) {

			dev_err(dev,

				"SMBus base address memory region 0x%x already in use.\n",

				SB800_PIIX4_FCH_PM_ADDR);
@@ -195,12 +192,12 @@ static int piix4_sb800_region_request(struct device *dev, 
		addr = ioremap(SB800_PIIX4_FCH_PM_ADDR,

			       SB800_PIIX4_FCH_PM_SIZE);

		if (!addr) {

			release_resource(res);

			release_mem_region(SB800_PIIX4_FCH_PM_ADDR,

					   SB800_PIIX4_FCH_PM_SIZE);

			dev_err(dev, "SMBus base address mapping failed.\n");

			return -ENOMEM;

		}



		mmio_cfg->res = res;

		mmio_cfg->addr = addr;



		return 0;
@@ -222,7 +219,8 @@ static void piix4_sb800_region_release(struct device *dev, 
{

	if (mmio_cfg->use_mmio) {

		iounmap(mmio_cfg->addr);

		release_resource(mmio_cfg->res);

		release_mem_region(SB800_PIIX4_FCH_PM_ADDR,

				   SB800_PIIX4_FCH_PM_SIZE);

		return;

	}