commit 46b348865011bf0d706fe1ec8c9cef08cf86ad40
author Ben Skeggs <bskeggs@redhat.com> Thu Sep 22 12:51:31 2011 +1000
committer Ben Skeggs <bskeggs@redhat.com> Thu Nov 10 08:58:13 2011 +1000
tree 57ac40e456cb28cc03c276329191090f9f6c92fe
parent bde4889aaa2d59c1febfeadd7f690be0ed143ed5

drm/nouveau: fix oops if i2c bus not found in nouveau_i2c_identify()

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

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 c6143df..d39b220 100644
--- a/drivers/gpu/drm/nouveau/nouveau_i2c.c
+++ b/drivers/gpu/drm/nouveau/nouveau_i2c.c
@@ -333,7 +333,7 @@
 
 	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);