Commit 0f44b766 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Greg Kroah-Hartman

drm/i915: fix error path in intel_setup_gmbus()

commit ed3f9fd1 upstream.

This fails to undo the setup for pin==0; moreover, something
interesting happens if the setup failed already at pin==0.
Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Fixes: f899fc64 ("drm/i915: use GMBUS to manage i2c links")
Signed-off-by: default avatarJani 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 2417c8c0)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 222d0fa4
...@@ -675,7 +675,7 @@ int intel_setup_gmbus(struct drm_device *dev) ...@@ -675,7 +675,7 @@ int intel_setup_gmbus(struct drm_device *dev)
return 0; return 0;
err: err:
while (--pin) { while (pin--) {
if (!intel_gmbus_is_valid_pin(dev_priv, pin)) if (!intel_gmbus_is_valid_pin(dev_priv, pin))
continue; continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment