Skip to content

Commit 110d7b0

Browse files
Yang Yingliangrafaeljw
authored andcommitted
PNP: fix name memory leak in pnp_alloc_dev()
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]>
1 parent eb70814 commit 110d7b0

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
@@ -148,14 +148,14 @@ struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *protocol, int id,
148148
dev->dev.coherent_dma_mask = dev->dma_mask;
149149
dev->dev.release = &pnp_release_device;
150150

151-
dev_set_name(&dev->dev, "%02x:%02x", dev->protocol->number, dev->number);
152-
153151
dev_id = pnp_add_id(dev, pnpid);
154152
if (!dev_id) {
155153
kfree(dev);
156154
return NULL;
157155
}
158156

157+
dev_set_name(&dev->dev, "%02x:%02x", dev->protocol->number, dev->number);
158+
159159
return dev;
160160
}
161161

0 commit comments

Comments
 (0)