Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b8d8ab5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
  leds: Fix bounds checking of wm8350->pmic.led
  regulator: move bq24022 init back to module_init instead of subsys_initcall
parents c5e18af9 8dd2c9e3

drivers/regulator/bq24022.c

+1 −5
Original line number Diff line number Diff line
@@ -152,11 +152,7 @@ static void __exit bq24022_exit(void) 
	platform_driver_unregister(&bq24022_driver);

}



/*

 * make sure this is probed before gpio_vbus and pda_power,

 * but after asic3 or other GPIO expander drivers.

 */

subsys_initcall(bq24022_init);

module_init(bq24022_init);

module_exit(bq24022_exit);



MODULE_AUTHOR("Philipp Zabel");

drivers/regulator/wm8350-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -1435,7 +1435,7 @@ int wm8350_register_led(struct wm8350 *wm8350, int lednum, int dcdc, int isink, 
	struct platform_device *pdev;

	int ret;



	if (lednum > ARRAY_SIZE(wm8350->pmic.led) || lednum < 0) {

	if (lednum >= ARRAY_SIZE(wm8350->pmic.led) || lednum < 0) {

		dev_err(wm8350->dev, "Invalid LED index %d\n", lednum);

		return -ENODEV;

	}