Commit 0f44b766 authored Feb 09, 2016 by Rasmus Villemoes Committed by Greg Kroah-Hartman Mar 03, 2016

drm/i915: fix error path in intel_setup_gmbus()



commit ed3f9fd1e865975ceefdb2a43b453e090b1fd787 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: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Fixes: f899fc64 ("drm/i915: use GMBUS to manage i2c links")
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 222d0fa4

drivers/gpu/drm/i915/intel_i2c.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -675,7 +675,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;