diff --git a/[refs] b/[refs]
index 79758662c9c5..4f29fb8e1bd2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 832fbb5aec6ec877ed9273a0b20520e3dc0b23b3
+refs/heads/master: 37e310edf3f6090eb118b7fcafd00221c290ac6b
diff --git a/trunk/drivers/media/pci/saa7134/saa7134-dvb.c b/trunk/drivers/media/pci/saa7134/saa7134-dvb.c
index b209de40a4f8..27915e501db9 100644
--- a/trunk/drivers/media/pci/saa7134/saa7134-dvb.c
+++ b/trunk/drivers/media/pci/saa7134/saa7134-dvb.c
@@ -607,6 +607,9 @@ static int configure_tda827x_fe(struct saa7134_dev *dev,
 	/* Get the first frontend */
 	fe0 = videobuf_dvb_get_frontend(&dev->frontends, 1);
 
+	if (!fe0)
+		return -EINVAL;
+
 	fe0->dvb.frontend = dvb_attach(tda10046_attach, cdec_conf, &dev->i2c_adap);
 	if (fe0->dvb.frontend) {
 		if (cdec_conf->i2c_gate)