drm/nouveau: fix oops if i2c bus not found in nouveau_i2c_identify()
authorBen Skeggs <bskeggs@redhat.com>
Thu, 22 Sep 2011 02:51:31 +0000 (12:51 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Wed, 9 Nov 2011 22:58:13 +0000 (08:58 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_i2c.c

index c6143df48b9f8a385d97e2b4d045c891f399ad90..d39b2202b197521473129d8c5e3cf1ccd6d34031 100644 (file)
@@ -333,7 +333,7 @@ nouveau_i2c_identify(struct drm_device *dev, const char *what,
 
        NV_DEBUG(dev, "Probing %ss on I2C bus: %d\n", what, index);
 
-       for (i = 0; info[i].addr; i++) {
+       for (i = 0; i2c && info[i].addr; i++) {
                if (nouveau_probe_i2c_addr(i2c, info[i].addr) &&
                    (!match || match(i2c, &info[i]))) {
                        NV_INFO(dev, "Detected %s: %s\n", what, info[i].type);