summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2007-01-19 21:02:26 -0600
committerMike Isely <isely@pobox.com>2007-01-19 21:02:26 -0600
commitefd3dcb4eb48b258a8973455bfeda8d67111b8c8 (patch)
treef15bb70e31e5adeb2cb53fee8fc543d56a8144c8
parentfd307533ca7769e4a192f89918b68bbb5f2f6b1d (diff)
downloadmediapointer-dvb-s2-efd3dcb4eb48b258a8973455bfeda8d67111b8c8.tar.gz
mediapointer-dvb-s2-efd3dcb4eb48b258a8973455bfeda8d67111b8c8.tar.bz2
pvrusb2: It's safe to kfree() a null pointer
From: Mike Isely <isely@pobox.com> Signed-off-by: Mike Isely <isely@pobox.com>
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 5acb67286..538f9a514 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -1218,8 +1218,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;
}