Re: [PATCH] ALSA: scarlett2: Fix 2i2 Gen 4 direct monitor gain on firmware 2417

["Geoffrey D. Bennett" <g@b4.vu>]

On Mon, May 25, 2026 at 09:28:38AM +0200, Takashi Iwai wrote:
> On Sat, 23 May 2026 23:04:14 +0200,
> Geoffrey D. Bennett wrote:
> > 
> > Firmware 2417 for the Scarlett 4th Gen 2i2 moved the direct monitor
> > gain parameter by 4 bytes, from offset 0x2a0 to 0x2a4, breaking the
> > "Direct Monitor X Mix Y" controls.
> > 
> > Special-case the offset in the get/set config helpers when the
> > running firmware is 2417 or later.
> > 
> > Fixes: 4e809a299677 ("ALSA: scarlett2: Add support for Solo, 2i2, and 4i4 Gen 4")
> > Cc: <stable@vger.kernel.org>
> > Signed-off-by: Geoffrey D. Bennett <g@b4.vu>
> > ---
> > Tested on a Scarlett 2i2 4th Gen by writing to "Direct Monitor 1
> > Mix A Input 01" and observing the USB traffic with usbmon:
> > 
> > - Firmware 2417, unpatched driver: write targets offset 0x2A0 (bug)
> > - Firmware 2417, patched driver:   write targets offset 0x2A4
> > - Firmware 2128, patched driver:   write targets offset 0x2A0
> 
> Applied now to for-linus branch.
> 
> It seems that this can be merged without conflict to for-next that
> contains already your previous series.  Let me know if any adjustment
> is needed at merging this with the previous one.

Thanks. Although they don't conflict, they are equivalent, so no need
for both. I think my previous series is the better way long term, so
can you drop the new patch when you merge to for-next? Or should I
send a revert? Or do you have a different preference?

Regards,
Geoffrey.