diff --git a/[refs] b/[refs] index 950ea93038d5..d2f8da544109 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f8c40b44161d64fd127aa93e717576ae0d6e9d2 +refs/heads/master: 8bfd4b290ac28752234bce8febe96497b389cc3e diff --git a/trunk/drivers/media/video/saa7164/saa7164-dvb.c b/trunk/drivers/media/video/saa7164/saa7164-dvb.c index 0e28b9668562..c78c73ab47d3 100644 --- a/trunk/drivers/media/video/saa7164/saa7164-dvb.c +++ b/trunk/drivers/media/video/saa7164/saa7164-dvb.c @@ -521,10 +521,9 @@ int saa7164_dvb_register(struct saa7164_tsport *port) case SAA7164_BOARD_HAUPPAUGE_HVR2200: case SAA7164_BOARD_HAUPPAUGE_HVR2200_2: case SAA7164_BOARD_HAUPPAUGE_HVR2200_3: + i2c_bus = &dev->i2c_bus[port->nr + 1]; switch (port->nr) { case 0: - i2c_bus = &dev->i2c_bus[1]; - port->dvb.frontend = dvb_attach(tda10048_attach, &hauppauge_hvr2200_1_config, &i2c_bus->i2c_adap); @@ -538,8 +537,6 @@ int saa7164_dvb_register(struct saa7164_tsport *port) break; case 1: - i2c_bus = &dev->i2c_bus[2]; - port->dvb.frontend = dvb_attach(tda10048_attach, &hauppauge_hvr2200_2_config, &i2c_bus->i2c_adap);