lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 395/846] ALSA: usb-audio: Drop superfluous 0 in Presonus Studio 1810cs ID
    Date
    From: Takashi Iwai <tiwai@suse.de>

    [ Upstream commit 1e583aef12aa74afd37c1418255cc4b74e023236 ]

    The vendor ID of Presonus Studio 1810c had a superfluous '0' in its
    USB ID. Drop it.

    Fixes: 8dc5efe3d17c ("ALSA: usb-audio: Add support for Presonus Studio 1810c")
    Link: https://lore.kernel.org/r/20211202083833.17784-1-tiwai@suse.de
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/usb/format.c | 2 +-
    sound/usb/mixer_quirks.c | 2 +-
    sound/usb/quirks.c | 2 +-
    3 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/sound/usb/format.c b/sound/usb/format.c
    index f5e676a51b30d..405dc0bf6678c 100644
    --- a/sound/usb/format.c
    +++ b/sound/usb/format.c
    @@ -375,7 +375,7 @@ static int parse_uac2_sample_rate_range(struct snd_usb_audio *chip,
    for (rate = min; rate <= max; rate += res) {

    /* Filter out invalid rates on Presonus Studio 1810c */
    - if (chip->usb_id == USB_ID(0x0194f, 0x010c) &&
    + if (chip->usb_id == USB_ID(0x194f, 0x010c) &&
    !s1810c_valid_sample_rate(fp, rate))
    goto skip_rate;

    diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
    index 823b6b8de942d..d48729e6a3b0a 100644
    --- a/sound/usb/mixer_quirks.c
    +++ b/sound/usb/mixer_quirks.c
    @@ -3254,7 +3254,7 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer)
    err = snd_rme_controls_create(mixer);
    break;

    - case USB_ID(0x0194f, 0x010c): /* Presonus Studio 1810c */
    + case USB_ID(0x194f, 0x010c): /* Presonus Studio 1810c */
    err = snd_sc1810_init_mixer(mixer);
    break;
    case USB_ID(0x2a39, 0x3fb0): /* RME Babyface Pro FS */
    diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
    index 64e1c20311ed4..ab9f3da49941f 100644
    --- a/sound/usb/quirks.c
    +++ b/sound/usb/quirks.c
    @@ -1290,7 +1290,7 @@ int snd_usb_apply_interface_quirk(struct snd_usb_audio *chip,
    if (chip->usb_id == USB_ID(0x0763, 0x2012))
    return fasttrackpro_skip_setting_quirk(chip, iface, altno);
    /* presonus studio 1810c: skip altsets incompatible with device_setup */
    - if (chip->usb_id == USB_ID(0x0194f, 0x010c))
    + if (chip->usb_id == USB_ID(0x194f, 0x010c))
    return s1810c_skip_setting_quirk(chip, iface, altno);


    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-25 04:10    [W:2.227 / U:0.272 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site