Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://github.com/tiwai/sound
* 'for-linus' of git://github.com/tiwai/sound:
ASoC: ssm2602: Re-enable oscillator after suspend
ALSA: usb-audio: Check for possible chip NULL pointer before clearing probing flag
ALSA: hda/realtek - Don't detect LO jack when identical with HP
ALSA: hda/realtek - Avoid bogus HP-pin assignment
ALSA: HDA: No power nids on 92HD93
ASoC: omap-mcbsp: Do not attempt to change DAI sysclk if stream is active
+21
-5
+7
-1
sound/pci/hda/patch_realtek.c
+7
-1
sound/pci/hda/patch_realtek.c
···
578
578
{
579
579
struct alc_spec *spec = codec->spec;
580
580
581
+
/* check LO jack only when it's different from HP */
582
+
if (spec->autocfg.line_out_pins[0] == spec->autocfg.hp_pins[0])
583
+
return;
584
+
581
585
spec->line_jack_present =
582
586
detect_jacks(codec, ARRAY_SIZE(spec->autocfg.line_out_pins),
583
587
spec->autocfg.line_out_pins);
···
1325
1321
* 15 : 1 --> enable the function "Mute internal speaker
1326
1322
* when the external headphone out jack is plugged"
1327
1323
*/
1328
-
if (!spec->autocfg.hp_pins[0]) {
1324
+
if (!spec->autocfg.hp_pins[0] &&
1325
+
!(spec->autocfg.line_out_pins[0] &&
1326
+
spec->autocfg.line_out_type == AUTO_PIN_HP_OUT)) {
1329
1327
hda_nid_t nid;
1330
1328
tmp = (ass >> 11) & 0x3; /* HP to chassis */
1331
1329
if (tmp == 0)
+1
sound/pci/hda/patch_sigmatel.c
+1
sound/pci/hda/patch_sigmatel.c
+2
-1
sound/soc/codecs/ssm2602.c
+2
-1
sound/soc/codecs/ssm2602.c
···
431
431
static int ssm2602_set_bias_level(struct snd_soc_codec *codec,
432
432
enum snd_soc_bias_level level)
433
433
{
434
-
u16 reg = snd_soc_read(codec, SSM2602_PWR) & 0xff7f;
434
+
u16 reg = snd_soc_read(codec, SSM2602_PWR);
435
+
reg &= ~(PWR_POWER_OFF | PWR_OSC_PDN);
435
436
436
437
switch (level) {
437
438
case SND_SOC_BIAS_ON:
+6
sound/soc/omap/omap-mcbsp.c
+6
sound/soc/omap/omap-mcbsp.c
···
516
516
struct omap_mcbsp_reg_cfg *regs = &mcbsp_data->regs;
517
517
int err = 0;
518
518
519
+
if (mcbsp_data->active)
520
+
if (freq == mcbsp_data->in_freq)
521
+
return 0;
522
+
else
523
+
return -EBUSY;
524
+
519
525
/* The McBSP signal muxing functions are only available on McBSP1 */
520
526
if (clk_id == OMAP_MCBSP_CLKR_SRC_CLKR ||
521
527
clk_id == OMAP_MCBSP_CLKR_SRC_CLKX ||
+5
-3
sound/usb/card.c
+5
-3
sound/usb/card.c
···
530
530
return chip;
531
531
532
532
__error:
533
-
if (chip && !chip->num_interfaces)
534
-
snd_card_free(chip->card);
535
-
chip->probing = 0;
533
+
if (chip) {
534
+
if (!chip->num_interfaces)
535
+
snd_card_free(chip->card);
536
+
chip->probing = 0;
537
+
}
536
538
mutex_unlock(®ister_mutex);
537
539
__err_val:
538
540
return NULL;