lkml.org 
[lkml]   [2016]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] media: saa7134 fix media_dev alloc error path to not free when alloc fails
Em Thu, 14 Apr 2016 10:31:20 -0600
Shuah Khan <shuahkh@osg.samsung.com> escreveu:

> media_dev alloc error path does kfree when alloc fails. Fix it to not call
> kfree when media_dev alloc fails.

No need. kfree(NULL) is OK.

Adding a label inside a conditional block is ugly.

>

> Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
> ---
> drivers/media/pci/saa7134/saa7134-core.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/pci/saa7134/saa7134-core.c b/drivers/media/pci/saa7134/saa7134-core.c
> index c0e1780..eab2684 100644
> --- a/drivers/media/pci/saa7134/saa7134-core.c
> +++ b/drivers/media/pci/saa7134/saa7134-core.c
> @@ -1046,7 +1046,7 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
> dev->media_dev = kzalloc(sizeof(*dev->media_dev), GFP_KERNEL);
> if (!dev->media_dev) {
> err = -ENOMEM;
> - goto fail0;
> + goto media_dev_alloc_fail;
> }
> media_device_pci_init(dev->media_dev, pci_dev, dev->name);
> dev->v4l2_dev.mdev = dev->media_dev;
> @@ -1309,6 +1309,7 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
> fail0:
> #ifdef CONFIG_MEDIA_CONTROLLER
> kfree(dev->media_dev);
> + media_dev_alloc_fail:
> #endif
> kfree(dev);
> return err;


--
Thanks,
Mauro

\
 
 \ /
  Last update: 2016-04-14 23:21    [W:0.384 / U:1.012 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site