diff options
author | Rasmus Villemoes <linux@rasmusvillemoes.dk> | 2016-02-09 21:11:13 +0100 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2016-02-10 18:11:34 +0200 |
commit | ed3f9fd1e865975ceefdb2a43b453e090b1fd787 (patch) | |
tree | c27fb25db04d80b8df56417ae9a34903acb4f72c /drivers/gpu | |
parent | 39748841a719c9b4ca41cedc299ca7605a22051c (diff) | |
download | linux-ed3f9fd1e865975ceefdb2a43b453e090b1fd787.tar.bz2 |
drm/i915: fix error path in intel_setup_gmbus()
This fails to undo the setup for pin==0; moreover, something
interesting happens if the setup failed already at pin==0.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Fixes: f899fc64cda8 ("drm/i915: use GMBUS to manage i2c links")
Cc: stable@vger.kernel.org
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1455048677-19882-3-git-send-email-linux@rasmusvillemoes.dk
(cherry picked from commit 2417c8c03f508841b85bf61acc91836b7b0e2560)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/i915/intel_i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c index 25254b5c1ac5..deb8282c26d8 100644 --- a/drivers/gpu/drm/i915/intel_i2c.c +++ b/drivers/gpu/drm/i915/intel_i2c.c @@ -683,7 +683,7 @@ int intel_setup_gmbus(struct drm_device *dev) return 0; err: - while (--pin) { + while (pin--) { if (!intel_gmbus_is_valid_pin(dev_priv, pin)) continue; |