diff --git a/[refs] b/[refs] index 8b2fb10ad6ce..91684b076cea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9fdd797659de7a989025c64c336542ac9c15d4d1 +refs/heads/master: c58b5ecd46bf1b4a54b769d4a17afd97af23188d diff --git a/trunk/drivers/media/dvb/ngene/ngene-core.c b/trunk/drivers/media/dvb/ngene/ngene-core.c index 6f1b06618147..1c86edd908fd 100644 --- a/trunk/drivers/media/dvb/ngene/ngene-core.c +++ b/trunk/drivers/media/dvb/ngene/ngene-core.c @@ -828,9 +828,9 @@ static int ngene_i2c_init(struct ngene *dev, int dev_nr) strcpy(adap->name, "nGene"); - adap->id = I2C_HW_SAA7146; adap->algo = &ngene_i2c_algo; adap->algo_data = (void *)&(dev->channel[dev_nr]); + adap->dev.parent = &dev->pci_dev->dev; mutex_init(&adap->bus_lock); return i2c_add_adapter(adap);