Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/video/omap2/displays/panel-taal.c between commit 9c3d5eb71b1f
("OMAP: DSS2: Remove suspicous and unused TAAL regulator API usage") from
the omap_dss2 tree and commit 3acc797c1db2 ("OMAPDSS: Taal: move reset
gpio handling to taal driver") from the arm-soc tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/video/omap2/displays/panel-taal.c
index 3053399,b2dd88b..0000000
--- 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);
}
Attachment:
pgpEzuacCl2ZW.pgp
Description: PGP signature
