drm/nouveau: Get rid of the remaining VGA CRTC locking.

[net-next-2.6.git] / drivers / gpu / drm / nouveau / nouveau_i2c.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.c b/drivers/gpu/drm/nouveau/nouveau_i2c.c
index 5588e66dd9fc9cc86933d3fa38306b8c132338b7..cb0cb34440c6e835246136cd7f6ade3f29e71d21 100644 (file)
--- 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;
 }