Merge tag 'ceph-for-5.11-rc1' of git://github.com/ceph/ceph-client

[mirror_ubuntu-hirsute-kernel.git] / drivers / uio / uio_mf624.c

diff --git a/drivers/uio/uio_mf624.c b/drivers/uio/uio_mf624.c
index b6a406986667ccf3f17039f9055143d18de4f7c2..5065c6a073a835621e74af0ae0b84e75534734ff 100644 (file)
--- a/drivers/uio/uio_mf624.c
+++ b/drivers/uio/uio_mf624.c
@@ -136,12 +136,12 @@ static int mf624_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
        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)
                return -ENOMEM;
 
        if (pci_enable_device(dev))
-               goto out_free;
+               return -ENODEV;
 
        if (pci_request_regions(dev, "mf624"))
                goto out_disable;
@@ -189,8 +189,6 @@ out_release:
 out_disable:
        pci_disable_device(dev);
 
-out_free:
-       kfree(info);
        return -ENODEV;
 }
 
@@ -207,8 +205,6 @@ static void mf624_pci_remove(struct pci_dev *dev)
        iounmap(info->mem[0].internal_addr);
        iounmap(info->mem[1].internal_addr);
        iounmap(info->mem[2].internal_addr);
-
-       kfree(info);
 }
 
 static const struct pci_device_id mf624_pci_id[] = {