diff options
Diffstat (limited to 'drivers/video/matrox/i2c-matroxfb.c')
-rw-r--r-- | drivers/video/matrox/i2c-matroxfb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/matrox/i2c-matroxfb.c b/drivers/video/matrox/i2c-matroxfb.c index c14e3e2212b3..cefabe818a12 100644 --- a/drivers/video/matrox/i2c-matroxfb.c +++ b/drivers/video/matrox/i2c-matroxfb.c | |||
@@ -112,7 +112,7 @@ static int i2c_bus_reg(struct i2c_bit_adapter* b, struct matrox_fb_info* minfo, | |||
112 | i2c_set_adapdata(&b->adapter, b); | 112 | i2c_set_adapdata(&b->adapter, b); |
113 | b->adapter.class = class; | 113 | b->adapter.class = class; |
114 | b->adapter.algo_data = &b->bac; | 114 | b->adapter.algo_data = &b->bac; |
115 | b->adapter.dev.parent = &ACCESS_FBINFO(pcidev)->dev; | 115 | b->adapter.dev.parent = &minfo->pcidev->dev; |
116 | b->bac = matrox_i2c_algo_template; | 116 | b->bac = matrox_i2c_algo_template; |
117 | b->bac.data = b; | 117 | b->bac.data = b; |
118 | err = i2c_bit_add_bus(&b->adapter); | 118 | err = i2c_bit_add_bus(&b->adapter); |
@@ -153,7 +153,7 @@ static void* i2c_matroxfb_probe(struct matrox_fb_info* minfo) { | |||
153 | matroxfb_DAC_out(PMINFO DAC_XGENIOCTRL, 0x00); | 153 | matroxfb_DAC_out(PMINFO DAC_XGENIOCTRL, 0x00); |
154 | matroxfb_DAC_unlock_irqrestore(flags); | 154 | matroxfb_DAC_unlock_irqrestore(flags); |
155 | 155 | ||
156 | switch (ACCESS_FBINFO(chip)) { | 156 | switch (minfo->chip) { |
157 | case MGA_2064: | 157 | case MGA_2064: |
158 | case MGA_2164: | 158 | case MGA_2164: |
159 | err = i2c_bus_reg(&m2info->ddc1, minfo, | 159 | err = i2c_bus_reg(&m2info->ddc1, minfo, |
@@ -168,7 +168,7 @@ static void* i2c_matroxfb_probe(struct matrox_fb_info* minfo) { | |||
168 | } | 168 | } |
169 | if (err) | 169 | if (err) |
170 | goto fail_ddc1; | 170 | goto fail_ddc1; |
171 | if (ACCESS_FBINFO(devflags.dualhead)) { | 171 | if (minfo->devflags.dualhead) { |
172 | err = i2c_bus_reg(&m2info->ddc2, minfo, | 172 | err = i2c_bus_reg(&m2info->ddc2, minfo, |
173 | DDC2_DATA, DDC2_CLK, | 173 | DDC2_DATA, DDC2_CLK, |
174 | "DDC:fb%u #1", I2C_CLASS_DDC); | 174 | "DDC:fb%u #1", I2C_CLASS_DDC); |