Commit 586de923 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull i2c fix from Wolfram Sang:
 "Fix double free of irq in amd-mp2 driver"

* tag 'i2c-for-6.14-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: amd-mp2: drop free_irq() of devm_request_irq() allocated irq
parents 183601b7 807d47a6

drivers/i2c/busses/i2c-amd-mp2-pci.c

+1 −4
Original line number Diff line number Diff line
@@ -327,13 +327,11 @@ static int amd_mp2_pci_init(struct amd_mp2_dev *privdata, 
			      amd_mp2_irq_isr, irq_flag, dev_name(&pci_dev->dev), privdata);

	if (rc) {

		pci_err(pci_dev, "Failure requesting irq %i: %d\n", privdata->dev_irq, rc);

		goto free_irq_vectors;

		goto err_dma_mask;

	}



	return rc;



free_irq_vectors:

	free_irq(privdata->dev_irq, privdata);

err_dma_mask:

	pci_clear_master(pci_dev);

err_pci_enable:
@@ -376,7 +374,6 @@ static void amd_mp2_pci_remove(struct pci_dev *pci_dev) 
	pm_runtime_forbid(&pci_dev->dev);

	pm_runtime_get_noresume(&pci_dev->dev);



	free_irq(privdata->dev_irq, privdata);

	pci_clear_master(pci_dev);



	amd_mp2_clear_reg(privdata);