From f9b094d03a213f5245f67a4ff4674065a7c552c8 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Thu, 17 Feb 2011 17:33:56 -0300 Subject: [PATCH] --- yaml --- r: 242104 b: refs/heads/master c: 7e270941c8f0a11224e383d3d38946451f66fbbf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/frontends/zl10036.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index e01e4609001d..8ca5526e28e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35d9f510b67b10338161aba6229d4f55b4000f5b +refs/heads/master: 7e270941c8f0a11224e383d3d38946451f66fbbf diff --git a/trunk/drivers/media/dvb/frontends/zl10036.c b/trunk/drivers/media/dvb/frontends/zl10036.c index 4627f491656b..81aa984c551f 100644 --- a/trunk/drivers/media/dvb/frontends/zl10036.c +++ b/trunk/drivers/media/dvb/frontends/zl10036.c @@ -463,16 +463,16 @@ struct dvb_frontend *zl10036_attach(struct dvb_frontend *fe, const struct zl10036_config *config, struct i2c_adapter *i2c) { - struct zl10036_state *state = NULL; + struct zl10036_state *state; int ret; - if (NULL == config) { + if (!config) { printk(KERN_ERR "%s: no config specified", __func__); - goto error; + return NULL; } state = kzalloc(sizeof(struct zl10036_state), GFP_KERNEL); - if (NULL == state) + if (!state) return NULL; state->config = config; @@ -507,7 +507,7 @@ struct dvb_frontend *zl10036_attach(struct dvb_frontend *fe, return fe; error: - zl10036_release(fe); + kfree(state); return NULL; } EXPORT_SYMBOL(zl10036_attach);