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

Commit a5939eef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

MFD fixes from Samuel Ortiz:
 "This is the pull request for the MFD fixes for 3.3.  We have a few
  NULL pointer dereferences fixes, an ACPI conflict check fix, and a
  couple of wm8994 fixes."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  mfd: Correct readability of WM8994 DC servo 4E register
  mfd: Initialize tps65912 irq platform data properly
  mfd: Fix ACPI conflict check
  mfd: Fix ab8500 error path bug
  mfd: Test for jack detection when deciding if wm8994 should suspend
  mfd: Initialize tps65910 irq platform data properly
  mfd: Fix possible s5m null pointer dereference
  mfd: wm8350 variable dereferenced before check
parents 5483f18e ac5ff1b3

drivers/mfd/ab8500-core.c

+3 −2
Original line number Diff line number Diff line
@@ -956,11 +956,12 @@ int __devinit ab8500_init(struct ab8500 *ab8500) 
	return ret;



out_freeirq:

	if (ab8500->irq_base) {

	if (ab8500->irq_base)

		free_irq(ab8500->irq, ab8500);

out_removeirq:

	if (ab8500->irq_base)

		ab8500_irq_remove(ab8500);

	}



	return ret;

}

drivers/mfd/mfd-core.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static int mfd_add_device(struct device *parent, int id, 
		}



		if (!cell->ignore_resource_conflicts) {

			ret = acpi_check_resource_conflict(res);

			ret = acpi_check_resource_conflict(&res[r]);

			if (ret)

				goto fail_res;

		}

drivers/mfd/s5m-core.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static int s5m87xx_i2c_probe(struct i2c_client *i2c, 
	s5m87xx->rtc = i2c_new_dummy(i2c->adapter, RTC_I2C_ADDR);

	i2c_set_clientdata(s5m87xx->rtc, s5m87xx);



	if (pdata->cfg_pmic_irq)

	if (pdata && pdata->cfg_pmic_irq)

		pdata->cfg_pmic_irq();



	s5m_irq_init(s5m87xx);

drivers/mfd/tps65910.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int tps65910_i2c_probe(struct i2c_client *i2c, 
		goto err;



	init_data->irq = pmic_plat_data->irq;

	init_data->irq_base = pmic_plat_data->irq;

	init_data->irq_base = pmic_plat_data->irq_base;



	tps65910_gpio_init(tps65910, pmic_plat_data->gpio_base);

drivers/mfd/tps65912-core.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ int tps65912_device_init(struct tps65912 *tps65912) 
		goto err;



	init_data->irq = pmic_plat_data->irq;

	init_data->irq_base = pmic_plat_data->irq;

	init_data->irq_base = pmic_plat_data->irq_base;

	ret = tps65912_irq_init(tps65912, init_data->irq, init_data);

	if (ret < 0)

		goto err;