From bf17fd9da7f35e6081a4774355bc2d2b6c3cc431 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Mon, 3 May 2010 02:10:15 -0300 Subject: [PATCH] --- yaml --- r: 201981 b: refs/heads/master c: fab9bfbed22f91f271a93a3dfa142179a2278935 h: refs/heads/master i: 201979: bc7d1dd5fc7bcbb9073279ae7efd86d72b8db9de v: v3 --- [refs] | 2 +- trunk/drivers/media/common/tuners/tda18271-fe.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e06e45e815b8..b64877c93cc9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4359e5b5ba3b746cd02bd3a18d576b11c0843419 +refs/heads/master: fab9bfbed22f91f271a93a3dfa142179a2278935 diff --git a/trunk/drivers/media/common/tuners/tda18271-fe.c b/trunk/drivers/media/common/tuners/tda18271-fe.c index b2e15456d5f3..7955e49a3440 100644 --- a/trunk/drivers/media/common/tuners/tda18271-fe.c +++ b/trunk/drivers/media/common/tuners/tda18271-fe.c @@ -1249,7 +1249,7 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr, struct tda18271_config *cfg) { struct tda18271_priv *priv = NULL; - int instance; + int instance, ret; mutex_lock(&tda18271_list_mutex); @@ -1268,10 +1268,12 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr, priv->cal_initialized = false; mutex_init(&priv->lock); - if (tda_fail(tda18271_get_id(fe))) + ret = tda18271_get_id(fe); + if (tda_fail(ret)) goto fail; - if (tda_fail(tda18271_assign_map_layout(fe))) + ret = tda18271_assign_map_layout(fe); + if (tda_fail(ret)) goto fail; mutex_lock(&priv->lock);