mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

pwm: Fixes for v6.7-rc1 

This contains two very small fixes that I failed to include in the main
 pull request for v6.7-rc1.
 -----BEGIN PGP SIGNATURE-----
 
 iQJNBAABCAA3FiEEiOrDCAFJzPfAjcif3SOs138+s6EFAmVN+7wZHHRoaWVycnku
 cmVkaW5nQGdtYWlsLmNvbQAKCRDdI6zXfz6zoUpcD/9zNKRqz3KrrH9RcykGKt/a
 hpumuucuMVq46iRMz3PbO1qf2FLWOb9x3cnj6XrfACHxWGKz7MIT05BrSGFYQdoB
 IdXBfZHz5NMDx4xPdRQiewgIQo0lz0YwB5302Tog+OfD2BLexW38nqNGjQlfKsxR
 5KVH99s1qhN2Q38NMRgYzCM41OurL2bSwtAehQi4I1Qodh+lnBVvaMOZGTlSH3XE
 paGnYbxvQDyYNnEjEGKqErdK+FSiMxMFLnJzT8grxwC5U2WNNeaR3nfcoNEFJEP5
 ELaHzXh/gyDsCZITa1X3e2xzPRInq1BjGU4wMnpGKWx2fitvw/FMSicgLvGL0w2v
 aQXVFXJK85dAF/juCo9gzFJ/cccbY6nhZOsh046NchBjhxuh7KSdZ1okOGhDW0hZ
 eSf3YXj+0DbkXogGP0/wBQvjk3XfjA0Bi4J/30KwQMTw1oRTF3/tXnwE1qPyMm8r
 b7tVFm05EdbPsv9Zv3jpUhUQLmoKNJpnUT8q3TeVXzKhvVjWB7yphuY7/638eUj2
 EN3t2BM9CE1RCoOw+KUH75xwincVsLgky/X0nuMipUya9BHPmi7g/ddj29J7a7EX
 Is34bnS/0GypbabeF2pH38ES2WaCU80JxZPAdcEIA3AVZ1QixmQ8O/vLy94gtpiX
 8m8y/HTMUa5ej86ucO2vUw==
 =Rrdu
 -----END PGP SIGNATURE-----

Merge tag 'pwm/for-6.7-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm

Pull pwm fixes from Thierry Reding:
 "This contains two very small fixes that I failed to include in the
  main pull request"

* tag 'pwm/for-6.7-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
  pwm: Fix double shift bug
  pwm: samsung: Fix a bit test in pwm_samsung_resume()
This commit is contained in:
Linus Torvalds 2023-11-10 11:34:16 -08:00
parent b712075e03 d27abbfd48
commit b077b7ee92
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pwm/pwm-samsung.c
View File

@ -631,7 +631,7 @@ static int pwm_samsung_resume(struct device *dev)
struct pwm_device *pwm = &chip->pwms[i];
struct samsung_pwm_channel *chan = &our_chip->channel[i];
if (!(pwm->flags & PWMF_REQUESTED))
if (!test_bit(PWMF_REQUESTED, &pwm->flags))
continue;
if (our_chip->variant.output_mask & BIT(i))

4
include/linux/pwm.h
View File

@ -41,8 +41,8 @@ struct pwm_args {
};
enum {
PWMF_REQUESTED = 1 << 0,
PWMF_EXPORTED = 1 << 1,
PWMF_REQUESTED = 0,
PWMF_EXPORTED = 1,
};
/*