From af0233e8f61e14dcb4405d9310b8a9967d26c327 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 22 Sep 2011 12:51:31 +1000 Subject: [PATCH] --- yaml --- r: 275266 b: refs/heads/master c: 46b348865011bf0d706fe1ec8c9cef08cf86ad40 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_i2c.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b1a4772b6504..c4ab13cf34cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bde4889aaa2d59c1febfeadd7f690be0ed143ed5 +refs/heads/master: 46b348865011bf0d706fe1ec8c9cef08cf86ad40 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_i2c.c b/trunk/drivers/gpu/drm/nouveau/nouveau_i2c.c index c6143df48b9f..d39b2202b197 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_i2c.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_i2c.c @@ -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);