Commit b077b7ee authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'pwm/for-6.7-rc1-fixes' of...

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()
parents b712075e d27abbfd
...@@ -631,7 +631,7 @@ static int pwm_samsung_resume(struct device *dev) ...@@ -631,7 +631,7 @@ static int pwm_samsung_resume(struct device *dev)
struct pwm_device *pwm = &chip->pwms[i]; struct pwm_device *pwm = &chip->pwms[i];
struct samsung_pwm_channel *chan = &our_chip->channel[i]; struct samsung_pwm_channel *chan = &our_chip->channel[i];
if (!(pwm->flags & PWMF_REQUESTED)) if (!test_bit(PWMF_REQUESTED, &pwm->flags))
continue; continue;
if (our_chip->variant.output_mask & BIT(i)) if (our_chip->variant.output_mask & BIT(i))
......
...@@ -41,8 +41,8 @@ struct pwm_args { ...@@ -41,8 +41,8 @@ struct pwm_args {
}; };
enum { enum {
PWMF_REQUESTED = 1 << 0, PWMF_REQUESTED = 0,
PWMF_EXPORTED = 1 << 1, PWMF_EXPORTED = 1,
}; };
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment