2.6.39-stable review patch. If anyone has any objections, please let us know.
------------------ From: Jean Delvare <[email protected]> commit 826c7e4147f902737b281e8a5a7d7aa33fd63316 upstream. Revert commit 8f9a3f9b63b8cd3f03be9dc53533f90bd4120e5f. This fixes a hang when loading the eeprom driver (see bug #35572.) GMBUS will be re-enabled later, differently. Signed-off-by: Jean Delvare <[email protected]> Reported-by: Marek Otahal <[email protected]> Tested-by: Yermandu Patapitafious <[email protected]> Tested-by: Andrew Lutomirski <[email protected]> Acked-by: Chris Wilson <[email protected]> Signed-off-by: Dave Airlie <[email protected]> Cc: Ben Hutchings <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- drivers/gpu/drm/i915/intel_i2c.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/gpu/drm/i915/intel_i2c.c +++ b/drivers/gpu/drm/i915/intel_i2c.c @@ -401,8 +401,7 @@ int intel_setup_gmbus(struct drm_device bus->reg0 = i | GMBUS_RATE_100KHZ; /* XXX force bit banging until GMBUS is fully debugged */ - if (IS_GEN2(dev)) - bus->force_bit = intel_gpio_create(dev_priv, i); + bus->force_bit = intel_gpio_create(dev_priv, i); } intel_i2c_reset(dev_priv->dev); _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
