diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-09-22 12:51:31 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-11-10 08:58:13 +1000 |
| commit | 46b348865011bf0d706fe1ec8c9cef08cf86ad40 (patch) | |
| tree | 57ac40e456cb28cc03c276329191090f9f6c92fe | |
| parent | bde4889aaa2d59c1febfeadd7f690be0ed143ed5 (diff) | |
| download | linux-x86-syscalls-46b348865011bf0d706fe1ec8c9cef08cf86ad40.tar.gz | |
drm/nouveau: fix oops if i2c bus not found in nouveau_i2c_identify()
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.c b/drivers/gpu/drm/nouveau/nouveau_i2c.c index c6143df48b9f8a..d39b2202b19752 100644 --- a/drivers/gpu/drm/nouveau/nouveau_i2c.c +++ b/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); |