summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSigmund Augdal <sigmund@snap.tv>2008-06-05 12:53:08 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-06-05 10:26:19 -0300
commit67642a0a58143761d7415f0587e0ac6dd6371251 (patch)
tree5202b481a9e117b9a5a9243f8b80ba62679bb523
parenta9606ce697ed719071fcccee8591ff033fa5e16d (diff)
downloadkernel-crypto-67642a0a58143761d7415f0587e0ac6dd6371251.tar.gz
kernel-crypto-67642a0a58143761d7415f0587e0ac6dd6371251.tar.xz
kernel-crypto-67642a0a58143761d7415f0587e0ac6dd6371251.zip
V4L/DVB (8000): tda827x: fix NULL pointer in tda827xa_lna_gain
Check that tda827x_config is defined before attempting to use it. Signed-off-by: Sigmund Augdal <sigmund@snap.tv> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/common/tuners/tda827x.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/common/tuners/tda827x.c b/drivers/media/common/tuners/tda827x.c
index d30d2c9094d..8555d9cf905 100644
--- a/drivers/media/common/tuners/tda827x.c
+++ b/drivers/media/common/tuners/tda827x.c
@@ -418,13 +418,13 @@ static void tda827xa_lna_gain(struct dvb_frontend *fe, int high,
unsigned char buf[] = {0x22, 0x01};
int arg;
int gp_func;
- struct i2c_msg msg = { .addr = priv->cfg->switch_addr, .flags = 0,
- .buf = buf, .len = sizeof(buf) };
+ struct i2c_msg msg = { .flags = 0, .buf = buf, .len = sizeof(buf) };
if (NULL == priv->cfg) {
dprintk("tda827x_config not defined, cannot set LNA gain!\n");
return;
}
+ msg.addr = priv->cfg->switch_addr;
if (priv->cfg->config) {
if (high)
dprintk("setting LNA to high gain\n");