drm/nouveau/i2c: fix some blatant abuse

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

diff --git a/drivers/gpu/drm/nouveau/core/subdev/i2c/base.c b/drivers/gpu/drm/nouveau/core/subdev/i2c/base.c
index 0dc605db7ec8f7ab17d50c7d27ab72b1bc0d3128..e5f1ffaa6ef061fff944f5abf0b159c59c900336 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/i2c/base.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/i2c/base.c
@@ -494,8 +494,8 @@ nouveau_i2c_create_port(struct nouveau_i2c *i2c, int index, u8 type,
                oclass = impl->pad_x;
        }
 
-       ret = nouveau_object_ctor(NULL, nv_object(i2c), oclass, NULL, pad,
-                                &parent);
+       ret = nouveau_object_ctor(nv_object(i2c), nv_object(i2c), oclass,
+                                 NULL, pad, &parent);
        if (ret < 0)
                return;
 

diff --git a/drivers/gpu/drm/nouveau/core/subdev/i2c/pad.h b/drivers/gpu/drm/nouveau/core/subdev/i2c/pad.h
index 452ac10c3004b4c79573fda9b714935e56aad72e..89aea46a7da1dfb70814246d77b3d01dde61ee93 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/i2c/pad.h
+++ b/drivers/gpu/drm/nouveau/core/subdev/i2c/pad.h
@@ -14,7 +14,7 @@ static inline struct nvkm_i2c_pad *
 nvkm_i2c_pad(struct nouveau_i2c_port *port)
 {
        struct nouveau_object *pad = nv_object(port);
-       while (pad->parent)
+       while (!nv_iclass(pad->parent, NV_SUBDEV_CLASS))
                pad = pad->parent;
        return (void *)pad;
 }