ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

uio: uio_cif: use devm_kzalloc() for uio_info object

Browse Source 
The uio_info object is free'd last, so it's life-time is tied PCI device
object. Using devm_kzalloc() cleans up the error path a bit and the exit
path.

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Link: https://lore.kernel.org/r/20201119154903.82099-1-alexandru.ardelean@analog.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexandru Ardelean
2020-11-19 17:49:00 +02:00
committed by Greg Kroah-Hartman
parent c3a7477911
commit 0a4ade5397
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/uio/uio_cif.c
View File

@@ -43,12 +43,12 @@ static int hilscher_pci_probe(struct pci_dev *dev,
{ {
struct uio_info *info; struct uio_info *info;
info = kzalloc(sizeof(struct uio_info), GFP_KERNEL); info = devm_kzalloc(&dev->dev, sizeof(struct uio_info), GFP_KERNEL);
if (!info) if (!info)
return -ENOMEM; return -ENOMEM;
if (pci_enable_device(dev)) if (pci_enable_device(dev))
goto out_free; return -ENODEV;
if (pci_request_regions(dev, "hilscher")) if (pci_request_regions(dev, "hilscher"))
goto out_disable; goto out_disable;
@@ -92,8 +92,6 @@ out_release:
pci_release_regions(dev); pci_release_regions(dev);
out_disable: out_disable:
pci_disable_device(dev); pci_disable_device(dev);
out_free:
kfree (info);
return -ENODEV; return -ENODEV;
} }
@@ -105,8 +103,6 @@ static void hilscher_pci_remove(struct pci_dev *dev)
pci_release_regions(dev); pci_release_regions(dev);
pci_disable_device(dev); pci_disable_device(dev);
iounmap(info->mem[0].internal_addr); iounmap(info->mem[0].internal_addr);
kfree (info);
} }
static struct pci_device_id hilscher_pci_ids[] = { static struct pci_device_id hilscher_pci_ids[] = {