diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-14 09:47:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-14 09:47:38 -0700 |
| commit | 9e07f98ab76fdeab5629f2f6c977f870a414f1f9 (patch) | |
| tree | f91b909d507fd71c238ad7bd625665420cebb5ee | |
| parent | 5b5f1455272e23f4e7889cec37228802d8d01adf (diff) | |
| parent | 1b52e50f2a402a266f1ba2281f0a57e87637a047 (diff) | |
| download | linux-9e07f98ab76fdeab5629f2f6c977f870a414f1f9.tar.gz linux-9e07f98ab76fdeab5629f2f6c977f870a414f1f9.tar.bz2 linux-9e07f98ab76fdeab5629f2f6c977f870a414f1f9.zip | |
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
| -rw-r--r-- | drivers/mfd/intel-lpss.h | 2 | ||||
| -rw-r--r-- | drivers/mfd/max77843.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mfd/intel-lpss.h b/drivers/mfd/intel-lpss.h index f28cb28a62f8..2c7f8d7c0595 100644 --- a/drivers/mfd/intel-lpss.h +++ b/drivers/mfd/intel-lpss.h @@ -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 \ diff --git a/drivers/mfd/max77843.c b/drivers/mfd/max77843.c index c52162ea3d0a..586098f1b233 100644 --- a/drivers/mfd/max77843.c +++ b/drivers/mfd/max77843.c @@ -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); |