diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-07-01 18:01:00 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-07-01 18:01:55 +0300 |
| commit | b5c21c84705dbd96a0fff930d33022a17910b4f4 (patch) | |
| tree | a080aa4383c8f4ffb91225d234ac9b530b2ff0fa /sound/usb | |
| parent | 7c2b3629d09ddec810dc4c1d3a6657c32def8f71 (diff) | |
| parent | 7fbd1753b64eafe21cf842348a40a691d0dee440 (diff) | |
| download | linux-b5c21c84705dbd96a0fff930d33022a17910b4f4.tar.xz | |
Merge branch 'for-linus' into for-next
This back-merge is necessary for adjusting the latest FireWire fix
with the recent refactoring in 5.3 development branch.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/mixer_quirks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index a751a18ca4c2..5783329a3237 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c @@ -754,7 +754,7 @@ static int snd_ni_control_init_val(struct usb_mixer_interface *mixer, return err; } - kctl->private_value |= (value << 24); + kctl->private_value |= ((unsigned int)value << 24); return 0; } @@ -915,7 +915,7 @@ static int snd_ftu_eff_switch_init(struct usb_mixer_interface *mixer, if (err < 0) return err; - kctl->private_value |= value[0] << 24; + kctl->private_value |= (unsigned int)value[0] << 24; return 0; } |