Skip to content

Commit 8ad59b3

Browse files
jdelvarewsakernel
authored andcommitted
i2c: piix4: Fix a memory leak in the EFCH MMIO support
The recently added support for EFCH MMIO regions introduced a memory leak in that code path. The leak is caused by the fact that release_resource() merely removes the resource from the tree but does not free its memory. We need to call release_mem_region() instead, which does free the memory. As a nice side effect, this brings back some symmetry between the legacy and MMIO paths. Signed-off-by: Jean Delvare <jdelvare@suse.de> Reported-by: Yi Zhang <yi.zhang@redhat.com> Tested-by: Yi Zhang <yi.zhang@redhat.com> Reviewed-by: Terry Bowman <terry.bowman@amd.com> Tested-by: Terry Bowman <Terry.Bowman@amd.com> Fixes: 7c14872 ("i2c: piix4: Add EFCH MMIO support to region request and release") Signed-off-by: Wolfram Sang <wsa@kernel.org>
1 parent 03c765b commit 8ad59b3

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

drivers/i2c/busses/i2c-piix4.c

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ static const char *piix4_aux_port_name_sb800 = " port 1";
161161

162162
struct sb800_mmio_cfg {
163163
void __iomem *addr;
164-
struct resource *res;
165164
bool use_mmio;
166165
};
167166

@@ -179,13 +178,11 @@ static int piix4_sb800_region_request(struct device *dev,
179178
struct sb800_mmio_cfg *mmio_cfg)
180179
{
181180
if (mmio_cfg->use_mmio) {
182-
struct resource *res;
183181
void __iomem *addr;
184182

185-
res = request_mem_region_muxed(SB800_PIIX4_FCH_PM_ADDR,
186-
SB800_PIIX4_FCH_PM_SIZE,
187-
"sb800_piix4_smb");
188-
if (!res) {
183+
if (!request_mem_region_muxed(SB800_PIIX4_FCH_PM_ADDR,
184+
SB800_PIIX4_FCH_PM_SIZE,
185+
"sb800_piix4_smb")) {
189186
dev_err(dev,
190187
"SMBus base address memory region 0x%x already in use.\n",
191188
SB800_PIIX4_FCH_PM_ADDR);
@@ -195,12 +192,12 @@ static int piix4_sb800_region_request(struct device *dev,
195192
addr = ioremap(SB800_PIIX4_FCH_PM_ADDR,
196193
SB800_PIIX4_FCH_PM_SIZE);
197194
if (!addr) {
198-
release_resource(res);
195+
release_mem_region(SB800_PIIX4_FCH_PM_ADDR,
196+
SB800_PIIX4_FCH_PM_SIZE);
199197
dev_err(dev, "SMBus base address mapping failed.\n");
200198
return -ENOMEM;
201199
}
202200

203-
mmio_cfg->res = res;
204201
mmio_cfg->addr = addr;
205202

206203
return 0;
@@ -222,7 +219,8 @@ static void piix4_sb800_region_release(struct device *dev,
222219
{
223220
if (mmio_cfg->use_mmio) {
224221
iounmap(mmio_cfg->addr);
225-
release_resource(mmio_cfg->res);
222+
release_mem_region(SB800_PIIX4_FCH_PM_ADDR,
223+
SB800_PIIX4_FCH_PM_SIZE);
226224
return;
227225
}
228226

0 commit comments

Comments
 (0)