Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-15 21:23:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] kfree cleanup: drivers/media

Browse Source 
This is the drivers/media/ part of the big kfree cleanup patch.

Remove pointless checks for NULL prior to calling kfree() in drivers/media/.

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Cc: Johannes Stezenbach <js@linuxtv.org>
Cc: Michael Krufky <mkrufky@m1k.net>
Cc: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Acked-by : Manu Abraham <manu@linuxtv.org>
Acked-by: Andreas Oberritter <obi@linuxtv.org>
Acked-by: Wilson Michaels <wilsonmichaels@earthlink.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jesper Juhl 2005-11-07 01:01:31 -08:00 committed by Linus Torvalds
parent 17fd682e54
commit 2ea7533060
12 changed files with 26 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/dvb/bt8xx/dst.c
View File

@ -1331,9 +1331,7 @@ struct dst_state *dst_attach(struct dst_state *state, struct dvb_adapter *dvb_ad
{
/* check if the ASIC is there */
if (dst_probe(state) < 0) {
if (state)
kfree(state);
kfree(state);
return NULL;
}
/* determine settings based on type */
@ -1349,9 +1347,7 @@ struct dst_state *dst_attach(struct dst_state *state, struct dvb_adapter *dvb_ad
break;
default:
dprintk(verbose, DST_ERROR, 1, "unknown DST type. please report to the LinuxTV.org DVB mailinglist.");
if (state)
kfree(state);
kfree(state);
return NULL;
}

4
drivers/media/dvb/frontends/dvb_dummy_fe.c
View File

@ -148,7 +148,7 @@ struct dvb_frontend* dvb_dummy_fe_qpsk_attach()
return &state->frontend;
error:
if (state) kfree(state);
kfree(state);
return NULL;
}
@ -171,7 +171,7 @@ struct dvb_frontend* dvb_dummy_fe_qam_attach()
return &state->frontend;
error:
if (state) kfree(state);
kfree(state);
return NULL;
}

3
drivers/media/dvb/frontends/l64781.c
View File

@ -559,7 +559,8 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config,
return &state->frontend;
error:
if (reg0x3e >= 0) l64781_writereg (state, 0x3e, reg0x3e); /* restore reg 0x3e */
if (reg0x3e >= 0)
l64781_writereg (state, 0x3e, reg0x3e); /* restore reg 0x3e */
kfree(state);
return NULL;
}

3
drivers/media/dvb/frontends/lgdt330x.c
View File

@ -731,8 +731,7 @@ struct dvb_frontend* lgdt330x_attach(const struct lgdt330x_config* config,
return &state->frontend;
error:
if (state)
kfree(state);
kfree(state);
dprintk("%s: ERROR\n",__FUNCTION__);
return NULL;
}

3
drivers/media/dvb/frontends/mt312.c
View File

@ -677,8 +677,7 @@ struct dvb_frontend* mt312_attach(const struct mt312_config* config,
return &state->frontend;
error:
if (state)
kfree(state);
kfree(state);
return NULL;
}

3
drivers/media/dvb/frontends/or51132.c
View File

@ -577,8 +577,7 @@ struct dvb_frontend* or51132_attach(const struct or51132_config* config,
return &state->frontend;
error:
if (state)
kfree(state);
kfree(state);
return NULL;
}

12
drivers/media/video/arv.c
View File

@ -865,10 +865,8 @@ out_dev:
out_irq:
#endif
for (i = 0; i < MAX_AR_HEIGHT; i++) {
if (ar->frame[i])
kfree(ar->frame[i]);
}
for (i = 0; i < MAX_AR_HEIGHT; i++)
kfree(ar->frame[i]);
out_line_buff:
#if USE_INT
@ -899,10 +897,8 @@ static void __exit ar_cleanup_module(void)
#if USE_INT
free_irq(M32R_IRQ_INT3, ar);
#endif
for (i = 0; i < MAX_AR_HEIGHT; i++) {
if (ar->frame[i])
kfree(ar->frame[i]);
}
for (i = 0; i < MAX_AR_HEIGHT; i++)
kfree(ar->frame[i]);
#if USE_INT
kfree(ar->line_buff);
#endif

6
drivers/media/video/bttv-driver.c
View File

@ -1951,8 +1951,7 @@ static int setup_window(struct bttv_fh *fh, struct bttv *btv,
}
down(&fh->cap.lock);
if (fh->ov.clips)
kfree(fh->ov.clips);
kfree(fh->ov.clips);
fh->ov.clips = clips;
fh->ov.nclips = n;
@ -2723,8 +2722,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
fh->ov.w.height = fb->fmt.height;
btv->init.ov.w.width = fb->fmt.width;
btv->init.ov.w.height = fb->fmt.height;
if (fh->ov.clips)
kfree(fh->ov.clips);
kfree(fh->ov.clips);
fh->ov.clips = NULL;
fh->ov.nclips = 0;

6
drivers/media/video/v4l1-compat.c
View File

@ -1006,10 +1006,8 @@ v4l_compat_translate_ioctl(struct inode *inode,
break;
}
if (cap2)
kfree(cap2);
if (fmt2)
kfree(fmt2);
kfree(cap2);
kfree(fmt2);
return err;
}

6
drivers/media/video/videocodec.c
View File

@ -353,8 +353,7 @@ videocodec_build_table (void)
dprintk(3, "videocodec_build table: %d entries, %d bytes\n", i,
size);
if (videocodec_buf)
kfree(videocodec_buf);
kfree(videocodec_buf);
videocodec_buf = (char *) kmalloc(size, GFP_KERNEL);
i = 0;
@ -471,8 +470,7 @@ videocodec_exit (void)
{
#ifdef CONFIG_PROC_FS
remove_proc_entry("videocodecs", NULL);
if (videocodec_buf)
kfree(videocodec_buf);
kfree(videocodec_buf);
#endif
}

3
drivers/media/video/videodev.c
View File

@ -215,8 +215,7 @@ video_usercopy(struct inode *inode, struct file *file,
}
out:
if (mbuf)
kfree(mbuf);
kfree(mbuf);
return err;
}

14
drivers/media/video/zoran_card.c
View File

@ -1057,10 +1057,8 @@ zr36057_init (struct zoran *zr)
KERN_ERR
"%s: zr36057_init() - kmalloc (STAT_COM) failed\n",
ZR_DEVNAME(zr));
if (vdev)
kfree(vdev);
if (mem)
kfree((void *)mem);
kfree(vdev);
kfree((void *)mem);
return -ENOMEM;
}
memset((void *) mem, 0, mem_needed);
@ -1105,15 +1103,15 @@ zoran_release (struct zoran *zr)
/* unregister videocodec bus */
if (zr->codec) {
struct videocodec_master *master = zr->codec->master_data;
videocodec_detach(zr->codec);
if (master)
kfree(master);
kfree(master);
}
if (zr->vfe) {
struct videocodec_master *master = zr->vfe->master_data;
videocodec_detach(zr->vfe);
if (master)
kfree(master);
kfree(master);
}
/* unregister i2c bus */