From 501c1b4ade367b700a79d7dda203606f00a30d78 Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" Date: Thu, 8 Mar 2012 16:13:23 +0000 Subject: [PATCH] --- yaml --- r: 293712 b: refs/heads/master c: 1e30296a603812fc3592b2a25e0daf3b416d42ce h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 303fbb329567..f33f899166f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 771f64d027db83f3627757723d63dac4ac9b523e +refs/heads/master: 1e30296a603812fc3592b2a25e0daf3b416d42ce diff --git a/trunk/drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c b/trunk/drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c index 705440874ac0..5e84fbde749b 100644 --- a/trunk/drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c +++ b/trunk/drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c @@ -127,7 +127,7 @@ static int oaktrail_hdmi_i2c_access(struct i2c_adapter *adap, { struct oaktrail_hdmi_dev *hdmi_dev = i2c_get_adapdata(adap); struct hdmi_i2c_dev *i2c_dev = hdmi_dev->i2c_dev; - int i, err = 0; + int i; mutex_lock(&i2c_dev->i2c_lock); @@ -139,9 +139,9 @@ static int oaktrail_hdmi_i2c_access(struct i2c_adapter *adap, for (i = 0; i < num; i++) { if (pmsg->len && pmsg->buf) { if (pmsg->flags & I2C_M_RD) - err = xfer_read(adap, pmsg); + xfer_read(adap, pmsg); else - err = xfer_write(adap, pmsg); + xfer_write(adap, pmsg); } pmsg++; /* next message */ }