sound fixes for 5.1
Linus,
please pull sound fixes for v5.1 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-5.1
The topmost commit is 3887c26c0e24d50a4d0ce20cf4726737cee1a2fd
----------------------------------------------------------------
sound fixes for 5.1
A few stable fixes at this round.
The USB Line6 audio fixes are a bit large, but they are rather trivial and pretty much device-specific, so should be safe to apply at this late stage. Ditto for other HD-audio quirks.
----------------------------------------------------------------
Greg Kroah-Hartman (1):
ALSA: line6: use dynamic buffers
Kailang Yang (2):
ALSA: hda/realtek - Add new Dell platform for headset mode
ALSA: hda/realtek - Fixed Dell AIO speaker noise
Takashi Iwai (1):
ALSA: hda/realtek - Apply the fixup for ASUS Q325UAR
--- sound/pci/hda/patch_realtek.c | 13 ++++++++++ sound/usb/line6/driver.c | 60 +++++++++++++++++++++++++------------------ sound/usb/line6/podhd.c | 21 ++++++++------- sound/usb/line6/toneport.c | 24 ++++++++++++----- 4 files changed, 78 insertions(+), 40 deletions(-)
sound/pci/hda/patch_realtek.c +13 -0
@@ -5450,6 +5450,8 @@ static void alc274_fixup_bind_dacs(struct hda_codec *codec,return ; spec->gen.preferred_dacs = preferred_pairs; + spec->gen.auto_mute_via_amp =1 ; + codec->power_save_node =0 ; }/* The DAC of NID 0x3 will introduce click/pop noise on headphones, so invalidate it */
@@ -7268,6 +7270,10 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x21, 0x02211020}),SND_HDA_PIN_QUIRK (0x10ec0236 ,0x1028 ,"Dell" ,ALC255_FIXUP_DELL1_MIC_NO_PRESENCE , {0x21, 0x02211020}), +SND_HDA_PIN_QUIRK (0x10ec0236 ,0x1028 ,"Dell" ,ALC255_FIXUP_DELL1_MIC_NO_PRESENCE , + {0x12, 0x40000000}, + {0x14, 0x90170110}, + {0x21, 0x02211020}),SND_HDA_PIN_QUIRK (0x10ec0255 ,0x1028 ,"Dell" ,ALC255_FIXUP_DELL2_MIC_NO_PRESENCE , {0x14, 0x90170110}, {0x21, 0x02211020}),
@@ -7541,6 +7547,13 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x12, 0x90a60130}, {0x17, 0x90170110}, {0x21, 0x04211020}), + SND_HDA_PIN_QUIRK(0x10ec0295, 0x1043, "ASUS", ALC294_FIXUP_ASUS_SPK, + {0x12, 0x90a60130}, + {0x17, 0x90170110}, + {0x21, 0x03211020}), + SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE, + {0x14, 0x90170110}, + {0x21, 0x04211020}), SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE, ALC295_STANDARD_PINS, {0x17, 0x21014020},
sound/usb/line6/driver.c +35 -25
141 lines not on this page · raw message
sound/usb/line6/podhd.c +12 -9
@@ -225,28 +225,32 @@ static void podhd_startup_start_workqueue(struct timer_list *t)static int podhd_dev_start (struct usb_line6_podhd *pod) {int ret; -u8 init_bytes[8 ]; +u8 *init_bytes;int i;struct usb_device *usbdev = pod->line6.usbdev; + init_bytes =kmalloc (8 ,GFP_KERNEL ); +if (!init_bytes) +return -ENOMEM ; + ret =usb_control_msg (usbdev,usb_sndctrlpipe (usbdev,0 ),0x67 ,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_OUT ,0x11 ,0 ,NULL ,0 ,LINE6_TIMEOUT *HZ );if (ret <0 ) {dev_err (pod->line6.ifcdev,"read request failed (error %d)\n" , ret); -return ret; + goto exit; }/* NOTE: looks like some kind of ping message */ ret =usb_control_msg (usbdev,usb_rcvctrlpipe (usbdev,0 ),0x67 ,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_IN ,0x11 ,0x0 , - &init_bytes,3 ,LINE6_TIMEOUT *HZ ); + init_bytes,3 ,LINE6_TIMEOUT *HZ );if (ret <0 ) {dev_err (pod->line6.ifcdev,"receive length failed (error %d)\n" , ret); -return ret; + goto exit; } pod->firmware_version =
@@ -255,7 +259,7 @@ static int podhd_dev_start(struct usb_line6_podhd *pod)for (i =0 ; i <=16 ; i++) { ret =line6_read_data (&pod->line6,0xf000 +0x08 * i, init_bytes,8 );if (ret <0 ) -return ret; + goto exit; } ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0),
@@ -263,10 +267,9 @@ static int podhd_dev_start(struct usb_line6_podhd *pod)USB_TYPE_STANDARD |USB_RECIP_DEVICE |USB_DIR_OUT ,1 ,0 , NULL, 0, LINE6_TIMEOUT * HZ); -if (ret <0 ) -return ret; - -return 0 ; +exit: +kfree (init_bytes); +return ret; }static void podhd_startup_workqueue (struct work_struct *work)
sound/usb/line6/toneport.c +18 -6
@@ -365,16 +365,21 @@ static bool toneport_has_source_select(struct usb_line6_toneport *toneport)/* Setup Toneport device. */ -static void toneport_setup (struct usb_line6_toneport *toneport) +static int toneport_setup (struct usb_line6_toneport *toneport) { -u32 ticks; +u32 *ticks;struct usb_line6 *line6 = &toneport->line6;struct usb_device *usbdev = line6->usbdev; + ticks =kmalloc (sizeof (*ticks),GFP_KERNEL ); +if (!ticks) +return -ENOMEM ; +/* sync time on device with host: */ /* note: 32-bit timestamps overflow in year 2106 */ - ticks = (u32 )ktime_get_real_seconds (); -line6_write_data (line6,0x80c6 , &ticks,4 ); + *ticks = (u32 )ktime_get_real_seconds (); +line6_write_data (line6,0x80c6 , ticks,4 ); +kfree (ticks);/* enable device: */ toneport_send_cmd (usbdev,0x0301 ,0x0000 );
@@ -389,6 +394,7 @@ static void toneport_setup(struct usb_line6_toneport *toneport)toneport_update_led (toneport);mod_timer (&toneport->timer, jiffies +TONEPORT_PCM_DELAY *HZ ); +return 0 ; }/*
@@ -451,7 +457,9 @@ static int toneport_init(struct usb_line6 *line6,return err; } -toneport_setup (toneport); + err =toneport_setup (toneport); +if (err) +return err;/* register audio system: */ return snd_card_register (line6->card);
@@ -463,7 +471,11 @@ static int toneport_init(struct usb_line6 *line6,*/ static int toneport_reset_resume (struct usb_interface *interface) { -toneport_setup (usb_get_intfdata (interface)); +int err; + + err =toneport_setup (usb_get_intfdata (interface)); +if (err) +return err;return line6_resume (interface); }#endif
The pull request you sent on Thu, 02 May 2019 20:35:52 +0200:
The pull request you sent on Thu, 02 May 2019 20:35:52 +0200:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.gittags/sound-5.1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/46572f785fb41949665ef4665563db5346f7cb30
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker