| Message ID | 1644337875-22219-1-git-send-email-guillaume.bertholon@ens.fr |
|---|---|
| State | New |
| Headers | show |
| Series | [4.9] ALSA: line6: Fix misplaced backport of "Fix wrong altsetting for LINE6_PODHD500_1" | expand |
On Tue, Feb 08, 2022 at 05:31:15PM +0100, Guillaume Bertholon wrote: > The upstream commit 70256b42caaf ("ALSA: line6: Fix wrong altsetting for > LINE6_PODHD500_1") changed the .altsetting field of the LINE6_PODHD500_1 > entry in podhd_properties_table from 1 to 0. > > However, its backported version in stable (commit ec565611f930 ("ALSA: > line6: Fix wrong altsetting for LINE6_PODHD500_1")) change the > .altsetting field of the LINE6_PODHD500_0 entry instead. > > This patch resets the altsetting of LINE6_PODHD500_0 to 1, and sets the > altsetting of LINE6_PODHD500_1 to 0, as wanted by the original fix. > > Fixes: ec565611f930 ("ALSA: line6: Fix wrong altsetting for LINE6_PODHD500_1") > Signed-off-by: Guillaume Bertholon <guillaume.bertholon@ens.fr> > --- > sound/usb/line6/podhd.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sound/usb/line6/podhd.c b/sound/usb/line6/podhd.c > index 7133c36..b3abc4c 100644 > --- a/sound/usb/line6/podhd.c > +++ b/sound/usb/line6/podhd.c > @@ -385,7 +385,7 @@ static const struct line6_properties podhd_properties_table[] = { > .name = "POD HD500", > .capabilities = LINE6_CAP_PCM > | LINE6_CAP_HWMON, > - .altsetting = 0, > + .altsetting = 1, > .ep_ctrl_r = 0x81, > .ep_ctrl_w = 0x01, > .ep_audio_r = 0x86, > @@ -396,7 +396,7 @@ static const struct line6_properties podhd_properties_table[] = { > .name = "POD HD500", > .capabilities = LINE6_CAP_PCM > | LINE6_CAP_HWMON, > - .altsetting = 1, > + .altsetting = 0, > .ep_ctrl_r = 0x81, > .ep_ctrl_w = 0x01, > .ep_audio_r = 0x86, > -- > 2.7.4 > All 3 fixes now applied, thanks! greg k-h
diff --git a/sound/usb/line6/podhd.c b/sound/usb/line6/podhd.c index 7133c36..b3abc4c 100644 --- a/sound/usb/line6/podhd.c +++ b/sound/usb/line6/podhd.c @@ -385,7 +385,7 @@ static const struct line6_properties podhd_properties_table[] = { .name = "POD HD500", .capabilities = LINE6_CAP_PCM | LINE6_CAP_HWMON, - .altsetting = 0, + .altsetting = 1, .ep_ctrl_r = 0x81, .ep_ctrl_w = 0x01, .ep_audio_r = 0x86, @@ -396,7 +396,7 @@ static const struct line6_properties podhd_properties_table[] = { .name = "POD HD500", .capabilities = LINE6_CAP_PCM | LINE6_CAP_HWMON, - .altsetting = 1, + .altsetting = 0, .ep_ctrl_r = 0x81, .ep_ctrl_w = 0x01, .ep_audio_r = 0x86,
The upstream commit 70256b42caaf ("ALSA: line6: Fix wrong altsetting for LINE6_PODHD500_1") changed the .altsetting field of the LINE6_PODHD500_1 entry in podhd_properties_table from 1 to 0. However, its backported version in stable (commit ec565611f930 ("ALSA: line6: Fix wrong altsetting for LINE6_PODHD500_1")) change the .altsetting field of the LINE6_PODHD500_0 entry instead. This patch resets the altsetting of LINE6_PODHD500_0 to 1, and sets the altsetting of LINE6_PODHD500_1 to 0, as wanted by the original fix. Fixes: ec565611f930 ("ALSA: line6: Fix wrong altsetting for LINE6_PODHD500_1") Signed-off-by: Guillaume Bertholon <guillaume.bertholon@ens.fr> --- sound/usb/line6/podhd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4