diff --git a/[refs] b/[refs]
index dc255898f223..aa514329e9f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b0c453aa78be253b4414cd337c9975f91e2c894
+refs/heads/master: 255c1887ccca6cde4a2eac231623b925bf621540
diff --git a/trunk/drivers/media/dvb/frontends/tda827x.c b/trunk/drivers/media/dvb/frontends/tda827x.c
index 50adfb5395ec..229b11987a58 100644
--- a/trunk/drivers/media/dvb/frontends/tda827x.c
+++ b/trunk/drivers/media/dvb/frontends/tda827x.c
@@ -556,6 +556,11 @@ static void tda827xa_lna_gain(struct dvb_frontend *fe, int high,
 	struct i2c_msg msg = { .addr = priv->i2c_addr, .flags = 0,
 			       .buf = buf, .len = sizeof(buf) };
 
+	if (NULL == priv->cfg) {
+		dprintk("tda827x_config not defined, cannot set LNA gain!\n");
+		return;
+	}
+
 	if (priv->cfg->config) {
 		if (high)
 			dprintk("setting LNA to high gain\n");