aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nouveau_i2c.c
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2010-07-24 17:41:48 +0200
committerBen Skeggs <bskeggs@redhat.com>2010-07-26 11:43:43 +1000
commit946fd35f88ae7ef910229e7995ab0c32d52517b4 (patch)
tree81458483bf8d1be8a579844a1a735ac37426b425 /drivers/gpu/drm/nouveau/nouveau_i2c.c
parentc88c2e0631b03ffb1485f8790a5b659beb1ac0be (diff)
downloadlinux-linaro-stable-946fd35f88ae7ef910229e7995ab0c32d52517b4.tar.gz
drm/nouveau: Get rid of the remaining VGA CRTC locking.
Signed-off-by: Francisco Jerez <currojerez@riseup.net> 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.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.c b/drivers/gpu/drm/nouveau/nouveau_i2c.c
index 5588e66dd9fc..cb0cb34440c6 100644
--- a/drivers/gpu/drm/nouveau/nouveau_i2c.c
+++ b/drivers/gpu/drm/nouveau/nouveau_i2c.c
@@ -305,21 +305,18 @@ nouveau_i2c_identify(struct drm_device *dev, const char *what,
struct i2c_board_info *info, int index)
{
struct nouveau_i2c_chan *i2c = nouveau_i2c_find(dev, index);
- int was_locked, i;
+ int i;
- was_locked = NVLockVgaCrtcs(dev, false);
NV_DEBUG(dev, "Probing %ss on I2C bus: %d\n", what, index);
for (i = 0; info[i].addr; i++) {
if (nouveau_probe_i2c_addr(i2c, info[i].addr)) {
NV_INFO(dev, "Detected %s: %s\n", what, info[i].type);
- goto out;
+ return i;
}
}
NV_DEBUG(dev, "No devices found.\n");
-out:
- NVLockVgaCrtcs(dev, was_locked);
- return info[i].addr ? i : -ENODEV;
+ return -ENODEV;
}