| Message ID | 1446896126-13369-2-git-send-email-fetzer.ch@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
On Sat, Nov 07, 2015 at 12:35:22PM +0100, Christian Fetzer wrote: > This is in preparation to support the multiplexed SMBus main controller > in the SB800 chipset where the controller address is shared among > the four multiplexed ports. As such the address region should be > only freed for the first multiplexed adapter to avoid double free > warnings. > > Signed-off-by: Christian Fetzer <fetzer.ch@gmail.com> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c index 630bce6..e78b982 100644 --- a/drivers/i2c/busses/i2c-piix4.c +++ b/drivers/i2c/busses/i2c-piix4.c @@ -660,13 +660,14 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id) return 0; } -static void piix4_adap_remove(struct i2c_adapter *adap) +static void piix4_adap_remove(struct i2c_adapter *adap, bool free_smba) { struct i2c_piix4_adapdata *adapdata = i2c_get_adapdata(adap); if (adapdata->smba) { i2c_del_adapter(adap); - release_region(adapdata->smba, SMBIOSIZE); + if (free_smba) + release_region(adapdata->smba, SMBIOSIZE); kfree(adapdata); kfree(adap); } @@ -675,12 +676,12 @@ static void piix4_adap_remove(struct i2c_adapter *adap) static void piix4_remove(struct pci_dev *dev) { if (piix4_main_adapter) { - piix4_adap_remove(piix4_main_adapter); + piix4_adap_remove(piix4_main_adapter, true); piix4_main_adapter = NULL; } if (piix4_aux_adapter) { - piix4_adap_remove(piix4_aux_adapter); + piix4_adap_remove(piix4_aux_adapter, true); piix4_aux_adapter = NULL; } }
This is in preparation to support the multiplexed SMBus main controller in the SB800 chipset where the controller address is shared among the four multiplexed ports. As such the address region should be only freed for the first multiplexed adapter to avoid double free warnings. Signed-off-by: Christian Fetzer <fetzer.ch@gmail.com> --- drivers/i2c/busses/i2c-piix4.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)