Skip to content

Commit ea77b4b

Browse files
Yang Yinglianggregkh
authored andcommitted
PNP: fix name memory leak in pnp_alloc_dev()
[ Upstream commit 110d7b0325c55ff3620073ba4201845f59e22ebf ] After commit 1fa5ae8 ("driver core: get rid of struct device's bus_id string array"), the name of device is allocated dynamically, move dev_set_name() after pnp_add_id() to avoid memory leak. Fixes: 1fa5ae8 ("driver core: get rid of struct device's bus_id string array") Signed-off-by: Yang Yingliang <[email protected]> Reviewed-by: Hanjun Guo <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent c5b088a commit ea77b4b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/pnp/core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,14 +159,14 @@ struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *protocol, int id,
159159
dev->dev.coherent_dma_mask = dev->dma_mask;
160160
dev->dev.release = &pnp_release_device;
161161

162-
dev_set_name(&dev->dev, "%02x:%02x", dev->protocol->number, dev->number);
163-
164162
dev_id = pnp_add_id(dev, pnpid);
165163
if (!dev_id) {
166164
kfree(dev);
167165
return NULL;
168166
}
169167

168+
dev_set_name(&dev->dev, "%02x:%02x", dev->protocol->number, dev->number);
169+
170170
return dev;
171171
}
172172

0 commit comments

Comments
 (0)