diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-02-24 09:56:18 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-02-25 15:09:19 +1000 |
| commit | 7f245b20e30515264b94f6373ef7d721155990a4 (patch) | |
| tree | 51c730665e69d92e64eb7dbbbb00ed3cc2480603 /drivers/gpu/drm/nouveau/nouveau_i2c.c | |
| parent | a6678b2ace023912000119a14eeb39a56050bc7c (diff) | |
| download | kernel_samsung_smdk4412-7f245b20e30515264b94f6373ef7d721155990a4.zip kernel_samsung_smdk4412-7f245b20e30515264b94f6373ef7d721155990a4.tar.gz kernel_samsung_smdk4412-7f245b20e30515264b94f6373ef7d721155990a4.tar.bz2 | |
drm/nouveau: merge parsed_dcb and bios_parsed_dcb into dcb_table
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_i2c.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_i2c.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.c b/drivers/gpu/drm/nouveau/nouveau_i2c.c index f0162c4..05fa498 100644 --- a/drivers/gpu/drm/nouveau/nouveau_i2c.c +++ b/drivers/gpu/drm/nouveau/nouveau_i2c.c @@ -259,11 +259,11 @@ nouveau_i2c_find(struct drm_device *dev, int index) if (index >= DCB_MAX_NUM_I2C_ENTRIES) return NULL; - if (!bios->bdcb.dcb.i2c[index].chan) { - if (nouveau_i2c_init(dev, &bios->bdcb.dcb.i2c[index], index)) + if (!bios->dcb.i2c[index].chan) { + if (nouveau_i2c_init(dev, &bios->dcb.i2c[index], index)) return NULL; } - return bios->bdcb.dcb.i2c[index].chan; + return bios->dcb.i2c[index].chan; } |