summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/bt8xx/dst.c
diff options
context:
space:
mode:
authorJohannes Stezenbach <devnull@localhost>2005-10-24 00:10:35 +0000
committerJohannes Stezenbach <devnull@localhost>2005-10-24 00:10:35 +0000
commita09b6b8851c72d9ac3a178cd9ecfe5e075c6d52f (patch)
treebfa489f2cef515181bd2f777280ff8122ac98b83 /linux/drivers/media/dvb/bt8xx/dst.c
parent575f44e16d90ff185f7dde17955967e6d4b3e603 (diff)
downloadmediapointer-dvb-s2-a09b6b8851c72d9ac3a178cd9ecfe5e075c6d52f.tar.gz
mediapointer-dvb-s2-a09b6b8851c72d9ac3a178cd9ecfe5e075c6d52f.tar.bz2
From: Jesper Juhl <jesper.juhl@gmail.com>
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> Signed-off-by: Andrew Morton <akpm@osdl.org>
Diffstat (limited to 'linux/drivers/media/dvb/bt8xx/dst.c')
-rw-r--r--linux/drivers/media/dvb/bt8xx/dst.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/linux/drivers/media/dvb/bt8xx/dst.c b/linux/drivers/media/dvb/bt8xx/dst.c
index feb9f9344..345d7e198 100644
--- a/linux/drivers/media/dvb/bt8xx/dst.c
+++ b/linux/drivers/media/dvb/bt8xx/dst.c
@@ -1403,9 +1403,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 */
@@ -1421,9 +1419,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;
}