From e3b120973f1b58172887b76b1f6aaeda00885620 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Tue, 14 Feb 2012 22:37:25 +0100 Subject: [PATCH] --- yaml --- r: 293835 b: refs/heads/master c: c3dfefa0a6d235bd465309e12f4c56ea16e71111 h: refs/heads/master i: 293833: 2bc09484efd454caddb0236d3247b95de75b9cc0 293831: 4bf9c7708d7eec2fe22e2022aed2076369977883 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_i2c.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f3e333041b69..c97d2d954182 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f6f808c8e1c4a3b7e3e0a6cb81541ec615aeb5fd +refs/heads/master: c3dfefa0a6d235bd465309e12f4c56ea16e71111 diff --git a/trunk/drivers/gpu/drm/i915/intel_i2c.c b/trunk/drivers/gpu/drm/i915/intel_i2c.c index 8fdc95700218..601c86e664af 100644 --- a/trunk/drivers/gpu/drm/i915/intel_i2c.c +++ b/trunk/drivers/gpu/drm/i915/intel_i2c.c @@ -390,7 +390,7 @@ int intel_setup_gmbus(struct drm_device *dev) bus->has_gpio = intel_gpio_setup(bus, i); /* XXX force bit banging until GMBUS is fully debugged */ - if (bus->has_gpio) + if (bus->has_gpio && IS_GEN2(dev)) bus->force_bit = true; }