Dmitry Eremin-Solenikov
2012-Sep-22  17:33 UTC
[Nouveau] [PATCH] drm/nouveau/i2c: correct default settings for i2c ports
Fix typo introduced when converting to core infrastructure.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin at mentor.com>
---
 drivers/gpu/drm/nouveau/core/subdev/bios/i2c.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/i2c.c
b/drivers/gpu/drm/nouveau/core/subdev/bios/i2c.c
index 5fcce5d..ad577db 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/bios/i2c.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/bios/i2c.c
@@ -112,13 +112,13 @@ dcb_i2c_parse(struct nouveau_bios *bios, u8 idx, struct
dcb_i2c_entry *info)
 			info->drive = nv_ro08(bios, ent + 4);
 			if (!info->drive) info->drive = 0x3f;
 			info->sense = nv_ro08(bios, ent + 5);
-			if (!info->sense) info->drive = 0x3e;
+			if (!info->sense) info->sense = 0x3e;
 		} else
 		if (idx == 1) {
 			info->drive = nv_ro08(bios, ent + 6);
 			if (!info->drive) info->drive = 0x37;
 			info->sense = nv_ro08(bios, ent + 7);
-			if (!info->sense) info->drive = 0x36;
+			if (!info->sense) info->sense = 0x36;
 		}
 
 		info->type = DCB_I2C_NV04_BIT;
-- 
1.7.10.4
Ben Skeggs
2012-Sep-26  01:06 UTC
[Nouveau] [PATCH] drm/nouveau/i2c: correct default settings for i2c ports
On Sat, Sep 22, 2012 at 09:33:50PM +0400, Dmitry Eremin-Solenikov wrote:> Fix typo introduced when converting to core infrastructure. > > Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin at mentor.com>Thanks, pushed! I'll likely squash this into the offending commit and note your corrections in the commit log. Ben.> --- > drivers/gpu/drm/nouveau/core/subdev/bios/i2c.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/i2c.c b/drivers/gpu/drm/nouveau/core/subdev/bios/i2c.c > index 5fcce5d..ad577db 100644 > --- a/drivers/gpu/drm/nouveau/core/subdev/bios/i2c.c > +++ b/drivers/gpu/drm/nouveau/core/subdev/bios/i2c.c > @@ -112,13 +112,13 @@ dcb_i2c_parse(struct nouveau_bios *bios, u8 idx, struct dcb_i2c_entry *info) > info->drive = nv_ro08(bios, ent + 4); > if (!info->drive) info->drive = 0x3f; > info->sense = nv_ro08(bios, ent + 5); > - if (!info->sense) info->drive = 0x3e; > + if (!info->sense) info->sense = 0x3e; > } else > if (idx == 1) { > info->drive = nv_ro08(bios, ent + 6); > if (!info->drive) info->drive = 0x37; > info->sense = nv_ro08(bios, ent + 7); > - if (!info->sense) info->drive = 0x36; > + if (!info->sense) info->sense = 0x36; > } > > info->type = DCB_I2C_NV04_BIT; > -- > 1.7.10.4 > > _______________________________________________ > Nouveau mailing list > Nouveau at lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/nouveau