diff options
| author | Grant Likely <grant.likely@linaro.org> | 2013-08-28 21:18:13 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2013-08-28 21:18:13 +0200 |
| commit | 8be137f2664f0abb096626a9d2ce0fcdd955b109 (patch) | |
| tree | 2c53a5535265a58eb397d6fbbab2ec26e92e6931 /sound/usb/quirks.c | |
| parent | include: dt-binding: input: create a DT header defining key codes. (diff) | |
| parent | Linux 3.11-rc7 (diff) | |
| download | linux-8be137f2664f0abb096626a9d2ce0fcdd955b109.tar.xz linux-8be137f2664f0abb096626a9d2ce0fcdd955b109.zip | |
Merge tag 'v3.11-rc7' into devicetree/next
Linux 3.11-rc7
Diffstat (limited to 'sound/usb/quirks.c')
| -rw-r--r-- | sound/usb/quirks.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 1bc45e71f1fe..0df9ede99dfd 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -319,19 +319,19 @@ static int create_auto_midi_quirk(struct snd_usb_audio *chip, if (altsd->bNumEndpoints < 1) return -ENODEV; epd = get_endpoint(alts, 0); - if (!usb_endpoint_xfer_bulk(epd) || + if (!usb_endpoint_xfer_bulk(epd) && !usb_endpoint_xfer_int(epd)) return -ENODEV; switch (USB_ID_VENDOR(chip->usb_id)) { case 0x0499: /* Yamaha */ err = create_yamaha_midi_quirk(chip, iface, driver, alts); - if (err < 0 && err != -ENODEV) + if (err != -ENODEV) return err; break; case 0x0582: /* Roland */ err = create_roland_midi_quirk(chip, iface, driver, alts); - if (err < 0 && err != -ENODEV) + if (err != -ENODEV) return err; break; } |