diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-26 14:47:44 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-26 14:47:44 -0300 |
commit | b83e521a82f61e3457c258da93f43ceae36daec3 (patch) | |
tree | 47407d6c63aff85c95af85971df2f66ae508e1bf /linux/drivers/media/dvb/frontends/cx24123.c | |
parent | a43bb4e65ce2015ec503f7933fbd136271d80c34 (diff) | |
parent | f1b096388308b69fdc4fe54e5952a7f7beb845bb (diff) | |
download | mediapointer-dvb-s2-b83e521a82f61e3457c258da93f43ceae36daec3.tar.gz mediapointer-dvb-s2-b83e521a82f61e3457c258da93f43ceae36daec3.tar.bz2 |
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
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.c | 4 |
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; } |