From d1fb470bf4b0bb73b4f349e60dbb7309960b76d9 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 5 May 2010 02:58:18 -0300 Subject: [PATCH] --- yaml --- r: 193153 b: refs/heads/master c: 83b6601c880d1b908b07952e9a5fdbe5f5c76c96 h: refs/heads/master i: 193151: ad505e3f21fb2586c22b1cd0dbafb0f35e3407f4 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/frontends/stv6110x.c | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index fbe85e03d2dc..ed236e9f5279 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a2f7178cbfeea7045b6cd226319d528f60891b8 +refs/heads/master: 83b6601c880d1b908b07952e9a5fdbe5f5c76c96 diff --git a/trunk/drivers/media/dvb/frontends/stv6110x.c b/trunk/drivers/media/dvb/frontends/stv6110x.c index 2f9cd2441340..42591ce1aaad 100644 --- a/trunk/drivers/media/dvb/frontends/stv6110x.c +++ b/trunk/drivers/media/dvb/frontends/stv6110x.c @@ -363,8 +363,8 @@ struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe, u8 default_regs[] = {0x07, 0x11, 0xdc, 0x85, 0x17, 0x01, 0xe6, 0x1e}; stv6110x = kzalloc(sizeof (struct stv6110x_state), GFP_KERNEL); - if (stv6110x == NULL) - goto error; + if (!stv6110x) + return NULL; stv6110x->i2c = i2c; stv6110x->config = config; @@ -392,12 +392,8 @@ struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe, fe->tuner_priv = stv6110x; fe->ops.tuner_ops = stv6110x_ops; - printk("%s: Attaching STV6110x \n", __func__); + printk(KERN_INFO "%s: Attaching STV6110x\n", __func__); return stv6110x->devctl; - -error: - kfree(stv6110x); - return NULL; } EXPORT_SYMBOL(stv6110x_attach);