summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2007-01-20 00:02:26 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 13:34:37 -0200
commit6710fb868b289d21139bd68262388e0ea34601eb (patch)
tree5db5bd8c7e463593b6e0b06e12c511239764396e /drivers
parente5bd0260e7d3d806e66c12859f50733dca43bbcf (diff)
downloadlinux-6710fb868b289d21139bd68262388e0ea34601eb.tar.gz
linux-6710fb868b289d21139bd68262388e0ea34601eb.tar.bz2
linux-6710fb868b289d21139bd68262388e0ea34601eb.zip
V4L/DVB (5078): Pvrusb2: It's safe to kfree() a null pointer
Signed-off-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-v4l2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 0ecad5b3c029..4c2e4defd71e 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -1189,8 +1189,8 @@ struct pvr2_v4l2 *pvr2_v4l2_create(struct pvr2_context *mnp)
vp->dev_video = kmalloc(sizeof(*vp->dev_video),GFP_KERNEL);
vp->dev_radio = kmalloc(sizeof(*vp->dev_radio),GFP_KERNEL);
if (!(vp->dev_video && vp->dev_radio)) {
- if (vp->dev_video) kfree(vp->dev_video);
- if (vp->dev_radio) kfree(vp->dev_radio);
+ kfree(vp->dev_video);
+ kfree(vp->dev_radio);
kfree(vp);
return NULL;
}