diff --git a/[refs] b/[refs]
index 0cef85522c9c..e809855037f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d12f51aa7bd43667078d021ba89e6ed8bfe42432
+refs/heads/master: ee03a6795e6a303e498e1c87e1e5d3702258e329
diff --git a/trunk/drivers/media/dvb/dvb-usb/opera1.c b/trunk/drivers/media/dvb/dvb-usb/opera1.c
index b6e12f9665b3..98fd9a6092b7 100644
--- a/trunk/drivers/media/dvb/dvb-usb/opera1.c
+++ b/trunk/drivers/media/dvb/dvb-usb/opera1.c
@@ -263,9 +263,9 @@ static struct stv0299_config opera1_stv0299_config = {
 
 static int opera1_frontend_attach(struct dvb_usb_adapter *d)
 {
-	if ((d->fe_adap[0].fe =
-	     dvb_attach(stv0299_attach, &opera1_stv0299_config,
-			&d->dev->i2c_adap)) != NULL) {
+	d->fe_adap[0].fe = dvb_attach(stv0299_attach, &opera1_stv0299_config,
+				      &d->dev->i2c_adap);
+	if ((d->fe_adap[0].fe) != NULL) {
 		d->fe_adap[0].fe->ops.set_voltage = opera1_set_voltage;
 		return 0;
 	}