summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/frontends/cx24123.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-02-26 21:02:33 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-02-26 21:02:33 -0300
commiteb20179da88acc42ffee334ce86bacdf77d4a438 (patch)
tree9f2196b723853e3d581b0b87b3f2ce666fc769be /linux/drivers/media/dvb/frontends/cx24123.c
parent1e4553680f02af66c3282072f581425637b58f78 (diff)
parent7dab4777ac8eda4056484c99285d58b6b3a91235 (diff)
downloadmediapointer-dvb-s2-eb20179da88acc42ffee334ce86bacdf77d4a438.tar.gz
mediapointer-dvb-s2-eb20179da88acc42ffee334ce86bacdf77d4a438.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-zoran
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/frontends/cx24123.c')
-rw-r--r--linux/drivers/media/dvb/frontends/cx24123.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/frontends/cx24123.c b/linux/drivers/media/dvb/frontends/cx24123.c
index c9cfc8393..f431f0c56 100644
--- a/linux/drivers/media/dvb/frontends/cx24123.c
+++ b/linux/drivers/media/dvb/frontends/cx24123.c
@@ -1084,13 +1084,13 @@ static struct dvb_frontend_ops cx24123_ops;
struct dvb_frontend *cx24123_attach(const struct cx24123_config *config,
struct i2c_adapter *i2c)
{
+ /* allocate memory for the internal state */
struct cx24123_state *state =
kzalloc(sizeof(struct cx24123_state), GFP_KERNEL);
dprintk("\n");
- /* allocate memory for the internal state */
if (state == NULL) {
- err("Unable to kmalloc\n");
+ err("Unable to kzalloc\n");
goto error;
}