diff options
| author | Joel Stanley <joel@jms.id.au> | 2019-12-12 01:32:01 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2019-12-12 01:32:06 +0300 |
| commit | fdc60468f3e452364d432f1a7c3f83d58bba1b84 (patch) | |
| tree | de7197f150958ae72cb87b6cf4885610f3edd704 /sound/usb/quirks.c | |
| parent | 20572eecd7248b66d855a8e4812debd9f828ccba (diff) | |
| parent | 8539dfa4fcbcf58c3c2f92ac57b964add884d12b (diff) | |
| download | linux-dev-5.3.tar.xz | |
Merge tag 'v5.3.15' into dev-5.3dev-5.3
This is the 5.3.15 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'sound/usb/quirks.c')
| -rw-r--r-- | sound/usb/quirks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 0bbe1201a6ac..349e1e52996d 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -248,8 +248,8 @@ static int create_yamaha_midi_quirk(struct snd_usb_audio *chip, NULL, USB_MS_MIDI_OUT_JACK); if (!injd && !outjd) return -ENODEV; - if (!(injd && snd_usb_validate_midi_desc(injd)) || - !(outjd && snd_usb_validate_midi_desc(outjd))) + if ((injd && !snd_usb_validate_midi_desc(injd)) || + (outjd && !snd_usb_validate_midi_desc(outjd))) return -ENODEV; if (injd && (injd->bLength < 5 || (injd->bJackType != USB_MS_EMBEDDED && |