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

Commit 9e07f98a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mfd-fixes-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd 

Pull MFD fixes from Lee Jones:
 "Bug Fixes:

   - Return correct error code i.e. not zero

   - Fix build error when !CONFIG_PM_SLEEP"

* tag 'mfd-fixes-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
  mfd: max77843: Fix max77843_chg_init() return on error
  mfd: intel-lpss: Fix build error when !CONFIG_PM_SLEEP
parents 5b5f1455 1b52e50f

drivers/mfd/intel-lpss.h

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ int intel_lpss_resume(struct device *dev); 
	.thaw = intel_lpss_resume,		\

	.poweroff = intel_lpss_suspend,		\

	.restore = intel_lpss_resume,

#else

#define INTEL_LPSS_SLEEP_PM_OPS

#endif



#define INTEL_LPSS_RUNTIME_PM_OPS		\

drivers/mfd/max77843.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static int max77843_chg_init(struct max77693_dev *max77843) 
	if (!max77843->i2c_chg) {

		dev_err(&max77843->i2c->dev,

				"Cannot allocate I2C device for Charger\n");

		return PTR_ERR(max77843->i2c_chg);

		return -ENODEV;

	}

	i2c_set_clientdata(max77843->i2c_chg, max77843);