From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Thu, 10 May 2012 16:55:44 +0000 (+0300)
Subject: Merge branch 'for-l-o-3.5'
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9b71fb5cbcdd83c65e5fe6db9cd12246f7ea0262;p=deliverable%2Flinux.git

Merge branch 'for-l-o-3.5'

Conflicts:
	drivers/video/omap2/displays/panel-taal.c

Merge OMAP DSS related board file changes. The branch will also be
merged through linux-omap tree to solve conflicts.
---

9b71fb5cbcdd83c65e5fe6db9cd12246f7ea0262
diff --cc drivers/video/omap2/displays/panel-taal.c
index 3053399faf9a,b2dd88b48420..2ce9992f403b
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@@ -992,8 -1082,13 +1001,11 @@@ err_gpio
  	if (bldev != NULL)
  		backlight_device_unregister(bldev);
  err_bl:
+ 	if (gpio_is_valid(panel_data->reset_gpio))
+ 		gpio_free(panel_data->reset_gpio);
+ err_rst_gpio:
  	destroy_workqueue(td->workqueue);
  err_wq:
 -	free_regulators(panel_config->regulators, panel_config->num_regulators);
 -err_reg:
  	kfree(td);
  err:
  	return r;
@@@ -1030,6 -1125,12 +1042,9 @@@ static void __exit taal_remove(struct o
  	/* reset, to be sure that the panel is in a valid state */
  	taal_hw_reset(dssdev);
  
 -	free_regulators(td->panel_config->regulators,
 -			td->panel_config->num_regulators);
 -
+ 	if (gpio_is_valid(panel_data->reset_gpio))
+ 		gpio_free(panel_data->reset_gpio);
+ 
  	kfree(td);
  }