Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Just a few small / trivial regression fixes at this time."
* tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: ice1724: Use linear scale for AK4396 volume control.
ALSA: hda_intel: add position_fix quirk for Asus K53E
ALSA: compress_core: fix open flags test in snd_compr_open()
ALSA: hda - Fix Oops at codec reset/reconfig
ALSA: usb-audio: Fix bogus error messages for delay accounting
ALSA: hda - Fix missing Master volume for STAC9200/925x
+14
-8
+3
-5
sound/core/compress_offload.c
+3
-5
sound/core/compress_offload.c
···
80
80
int maj = imajor(inode);
81
81
int ret;
82
82
83
-
if (f->f_flags & O_WRONLY)
83
+
if ((f->f_flags & O_ACCMODE) == O_WRONLY)
84
84
dirn = SND_COMPRESS_PLAYBACK;
85
-
else if (f->f_flags & O_RDONLY)
85
+
else if ((f->f_flags & O_ACCMODE) == O_RDONLY)
86
86
dirn = SND_COMPRESS_CAPTURE;
87
-
else {
88
-
pr_err("invalid direction\n");
87
+
else
89
88
return -EINVAL;
90
-
}
91
89
92
90
if (maj == snd_major)
93
91
compr = snd_lookup_minor_data(iminor(inode),
+1
-1
sound/pci/hda/hda_codec.c
+1
-1
sound/pci/hda/hda_codec.c
···
2353
2353
}
2354
2354
if (codec->patch_ops.free)
2355
2355
codec->patch_ops.free(codec);
2356
+
memset(&codec->patch_ops, 0, sizeof(codec->patch_ops));
2356
2357
snd_hda_jack_tbl_clear(codec);
2357
2358
codec->proc_widget_hook = NULL;
2358
2359
codec->spec = NULL;
···
2369
2368
codec->num_pcms = 0;
2370
2369
codec->pcm_info = NULL;
2371
2370
codec->preset = NULL;
2372
-
memset(&codec->patch_ops, 0, sizeof(codec->patch_ops));
2373
2371
codec->slave_dig_outs = NULL;
2374
2372
codec->spdif_status_reset = 0;
2375
2373
module_put(codec->owner);
+1
sound/pci/hda/hda_intel.c
+1
sound/pci/hda/hda_intel.c
···
2701
2701
SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),
2702
2702
SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS", POS_FIX_LPIB),
2703
2703
SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS M2V", POS_FIX_LPIB),
2704
+
SND_PCI_QUIRK(0x1043, 0x1b43, "ASUS K53E", POS_FIX_POSBUF),
2704
2705
SND_PCI_QUIRK(0x104d, 0x9069, "Sony VPCS11V9E", POS_FIX_LPIB),
2705
2706
SND_PCI_QUIRK(0x10de, 0xcb89, "Macbook Pro 7,1", POS_FIX_LPIB),
2706
2707
SND_PCI_QUIRK(0x1297, 0x3166, "Shuttle", POS_FIX_LPIB),
+1
-1
sound/pci/hda/patch_sigmatel.c
+1
-1
sound/pci/hda/patch_sigmatel.c
+2
-1
sound/pci/ice1712/prodigy_hifi.c
+2
-1
sound/pci/ice1712/prodigy_hifi.c
···
297
297
}
298
298
299
299
static const DECLARE_TLV_DB_SCALE(db_scale_wm_dac, -12700, 100, 1);
300
+
static const DECLARE_TLV_DB_LINEAR(ak4396_db_scale, TLV_DB_GAIN_MUTE, 0);
300
301
301
302
static struct snd_kcontrol_new prodigy_hd2_controls[] __devinitdata = {
302
303
{
···
308
307
.info = ak4396_dac_vol_info,
309
308
.get = ak4396_dac_vol_get,
310
309
.put = ak4396_dac_vol_put,
311
-
.tlv = { .p = db_scale_wm_dac },
310
+
.tlv = { .p = ak4396_db_scale },
312
311
},
313
312
};
314
313
+6
sound/usb/pcm.c
+6
sound/usb/pcm.c
···
1140
1140
int processed = urb->transfer_buffer_length / stride;
1141
1141
int est_delay;
1142
1142
1143
+
/* ignore the delay accounting when procssed=0 is given, i.e.
1144
+
* silent payloads are procssed before handling the actual data
1145
+
*/
1146
+
if (!processed)
1147
+
return;
1148
+
1143
1149
spin_lock_irqsave(&subs->lock, flags);
1144
1150
est_delay = snd_usb_pcm_delay(subs, runtime->rate);
1145
1151
/* update delay with exact number of samples played */