mirror of
https://github.com/torvalds/linux.git
synced 2026-06-04 20:46:48 +02:00
i2c-for-6.14-rc8
amd-mp2 driver: fix double free of irq -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEOZGx6rniZ1Gk92RdFA3kzBSgKbYFAmffOuIACgkQFA3kzBSg Kbbk8g/+PTkmHGiisPwX5nUDmvmFzRFG/mphHjVUtTDw0Yp2gR4lOyHZlLIaDTNk olqferh+LniC6Bl73rn84DJShQ/ATtiPY4MlFvUHrLwN0lLqqJC7LuabKUTjpYC6 OSaMhM0BOo3A69pKRSD06MWDtDZYk5o8o29uk6IZ9tFNGBEQvZOGoMVaatR//13o c/iBQUxO/hP0x/Uk+Ad1JU/2YeiyDmG2EalDZyyX63gTCcB3dMfI4UekLri1vQea 6Py9g8TIrmWpEgpI6ys6IeOGqERK40HJZ/RZDVnHS7Uv/QQ6QlLC608X47t7+tgW ZTCerCjrIHSjDaHSNbvqk29jVc17gLYOZzMSoborZJuypBecVK12k+CDrvyMcVSi +Q27+FnWg07SIQzNJK6aH7TrBkzsIav3n/+WT6LUcozUPNE1A884c+Gn1/9uYVLW 13BOLT44Hvdk76E8Ff9Tc6akct5Agyrl3fQzAX4orLuBg9fxkPAkhqByZsX0rbSy 9ympypSYlORJux6+gCQRk3hCTtcrHOutnkHTuiQuMExdQhe28z9R+AiVSn0S66mR bh5FQOPG2cLWqRCG2z7dUKh3ZoQvorRwNS2DUCZQJIqRYvhKr4zUhjstTZL2DLYJ XGrC8rmpNoXeK1wn139kyKAQ90kCHXtsHbF9xibURtZhhNFL0yU= =RvqJ -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
586de92313
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user