From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Fetzer Subject: [PATCH 1/4] i2c-piix4: Optionally release smba in piix4_adap_remove Date: Tue, 25 Aug 2015 13:05:02 +0200 Message-ID: <1440500705-2288-2-git-send-email-fetzer.ch@gmail.com> References: <1440500705-2288-1-git-send-email-fetzer.ch@gmail.com> Return-path: In-Reply-To: <1440500705-2288-1-git-send-email-fetzer.ch-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Sender: linux-i2c-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: tbrandonau-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, eddi-soWH+0lSOSbR7s880joybQ@public.gmane.org, galandilias-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, Christian Fetzer List-Id: linux-i2c@vger.kernel.org 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 --- drivers/i2c/busses/i2c-piix4.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c index 630bce6..97d2165 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, int 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, 1); piix4_main_adapter = NULL; } if (piix4_aux_adapter) { - piix4_adap_remove(piix4_aux_adapter); + piix4_adap_remove(piix4_aux_adapter, 1); piix4_aux_adapter = NULL; } } -- 1.9.1