Skip to content

Commit b077b7e

Browse files
committed
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()
2 parents b712075 + d27abbf commit b077b7e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

drivers/pwm/pwm-samsung.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ static int pwm_samsung_resume(struct device *dev)
631631
struct pwm_device *pwm = &chip->pwms[i];
632632
struct samsung_pwm_channel *chan = &our_chip->channel[i];
633633

634-
if (!(pwm->flags & PWMF_REQUESTED))
634+
if (!test_bit(PWMF_REQUESTED, &pwm->flags))
635635
continue;
636636

637637
if (our_chip->variant.output_mask & BIT(i))

include/linux/pwm.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ struct pwm_args {
4141
};
4242

4343
enum {
44-
PWMF_REQUESTED = 1 << 0,
45-
PWMF_EXPORTED = 1 << 1,
44+
PWMF_REQUESTED = 0,
45+
PWMF_EXPORTED = 1,
4646
};
4747

4848
/*

0 commit comments

Comments
 (0)