1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.c b/drivers/gpu/drm/nouveau/nouveau_i2c.c
index d0d581440d5e..116ef3193fc7 100644
--- a/drivers/gpu/drm/nouveau/nouveau_i2c.c
+++ b/drivers/gpu/drm/nouveau/nouveau_i2c.c
@@ -375,9 +375,13 @@ nouveau_i2c_identify(struct drm_device *dev, const char *what,
         struct nouveau_i2c_chan *i2c = nouveau_i2c_find(dev, index);
         int i;
 
-        NV_DEBUG(dev, "Probing %ss on I2C bus: %d\n", what, index);
+        if (!i2c) {
+                NV_DEBUG(dev, "No bus when probing %s on %d\n", what, index);
+                return -ENODEV;
+        }
 
-        for (i = 0; i2c && info[i].addr; i++) {
+        NV_DEBUG(dev, "Probing %ss on I2C bus: %d\n", what, i2c->index);
+        for (i = 0; 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);
@@ -386,6 +390,5 @@ nouveau_i2c_identify(struct drm_device *dev, const char *what,
         }
 
         NV_DEBUG(dev, "No devices found.\n");
-
         return -ENODEV;
 }