mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

- Bug Fixes

Browse source 
- Return correct error code i.e. not zero
    - Fix build error when !CONFIG_PM_SLEEP
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWHhRlAAoJEFGvii+H/HdhWnUP/Ra+5qnYT2PT5rA7htkfmNSm
 xLF7jd4coZUBACSCC+4h7sCA3GoEaoKDMbbIPxX7jrwvaAqBYCJBSNeXUJWjBEiP
 QcG6D6dtO40Khi98ySKX3VMSTi2b8MHomrEp56J2sFMGhmdn6dyEYvGyEDhkKuS5
 UdERXeFOpLJ/PKqulhtJkg+eeGEcb3WEPTqxc1WRFEhwU8h8PPIiEjP/1r8Dd1aX
 9mnrs0hwR+1/8qiTI44bizBCLBaLCjJs6nYofmcGUiDEs/rJ44R5lV/fo0AFncVe
 +ZVpwXuDVU+8P3tcK6NUiregsi7eQhjjvCzNwZKOWEjOGiEXgxhNRrvhaX7Grzkt
 xmVpIAfs8j3cnKzjFnsHz2PyTG04xWo+q518H28pyRCa7FTXaX1m0ubuoiahS+5Z
 Fw8GGAuvyHs+DuVl4miyEbEuVwhAIP65e7hMhVXRI2wzDXPSKsODMguQ5x6CcCOh
 v+to4kO88OK80V/aCQ70XDV8CSK7K/MIIDKQLHgOc+uEP1DoDh0VjO1CeLmHL4/0
 AS9vzFone2dfCQSkEr4qQaQmi0iyTrhyRKCld2B2SrGiXEbM6/T1oecFvSmEcKdp
 a8uWX7SxGijNQqdvjDzUPYORWFBLoBnZEAtWmh+HFjJTKPzWTKwj+gIeoNc4Xu9o
 LN0rfubfoH8iXao5yuXg
 =V6bR
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2015-10-14 09:47:38 -07:00
commit 9e07f98ab7
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/mfd/intel-lpss.h
View file

@ -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 \

2
drivers/mfd/max77843.c
View file

@ -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);