forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/gi…
…t/tiwai/sound Pull sound fixes from Takashi Iwai: - A series of fixes for Conexant 20549 HD-audio codec chip - A workaround for HDMI hotplug debug prints that annoyed people - A fix for the new support of platform DAPM contexts - Many driver-specific minor fixes * tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: hda - hide HDMI/ELD printks unless snd.debug=2 ALSA: sound/isa/sscape.c: add missing resource-release code sound: sound/oss/msnd_pinnacle.c: add vfrees ALSA: hda - clean up CX20549 test mixer setup ALSA: hda - CX20549 doesn't need pin_amp_workaround. ALSA: hda - Remove CD control from model=benq for CX20549 ALSA: hda - fix record volume controls of CX20459 ("Venice") ALSA: hda - Rename capture sources of CX20549 to match common conventions ALSA: hda - Fix proc output for ADC amp values of CX20549 ASoC: tegra: fix i2s compilation when !CONFIG_DEBUG_FS ASoC: set idle_bias_off=1 for all platform DAPM contexts ASoC: imx-audmux: Check for NULL pointer ASoC: imx-audmux: Fix ssi port numbers in sysfs ASoC: ak4642: fixup: mute needs +1 step MAINTAINERS: Don't list everyone working on Wolfson drivers MAINTAINERS: Add missing ASoC OMAP co-maintainer ASoC: pxa: pxa2xx-i2s: add io.h for IOMEM macro ASoC: tegra: ensure clocks are enabled when touching registers ASoC: sgtl5000: Enable VAG when DAC/ADC up ALSA: asihpi - fix return value of hpios_locked_mem_alloc()
- Loading branch information
Showing
18 changed files
with
120 additions
and
106 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4803,6 +4803,7 @@ F: arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | |
F: arch/arm/mach-omap2/clockdomain44xx.c | ||
|
||
OMAP AUDIO SUPPORT | ||
M: Peter Ujfalusi <[email protected]> | ||
M: Jarkko Nikula <[email protected]> | ||
L: [email protected] (subscribers-only) | ||
L: [email protected] | ||
|
@@ -7461,8 +7462,7 @@ F: include/linux/wm97xx.h | |
|
||
WOLFSON MICROELECTRONICS DRIVERS | ||
M: Mark Brown <[email protected]> | ||
M: Ian Lartey <[email protected]> | ||
M: Dimitris Papastamos <[email protected]> | ||
L: [email protected] | ||
T: git git://opensource.wolfsonmicro.com/linux-2.6-asoc | ||
T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus | ||
W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/****************************************************************************** | ||
AudioScience HPI driver | ||
Copyright (C) 1997-2011 AudioScience Inc. <[email protected]> | ||
Copyright (C) 1997-2012 AudioScience Inc. <[email protected]> | ||
This program is free software; you can redistribute it and/or modify | ||
it under the terms of version 2 of the GNU General Public License as | ||
|
@@ -42,7 +42,7 @@ On error *pLockedMemHandle marked invalid, non-zero returned. | |
If this function succeeds, then HpiOs_LockedMem_GetVirtAddr() and | ||
HpiOs_LockedMem_GetPyhsAddr() will always succed on the returned handle. | ||
*/ | ||
int hpios_locked_mem_alloc(struct consistent_dma_area *p_locked_mem_handle, | ||
u16 hpios_locked_mem_alloc(struct consistent_dma_area *p_locked_mem_handle, | ||
/**< memory handle */ | ||
u32 size, /**< Size in bytes to allocate */ | ||
struct pci_dev *p_os_reference | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/****************************************************************************** | ||
AudioScience HPI driver | ||
Copyright (C) 1997-2011 AudioScience Inc. <[email protected]> | ||
Copyright (C) 1997-2012 AudioScience Inc. <[email protected]> | ||
This program is free software; you can redistribute it and/or modify | ||
it under the terms of version 2 of the GNU General Public License as | ||
|
@@ -39,11 +39,11 @@ void hpios_delay_micro_seconds(u32 num_micro_sec) | |
|
||
} | ||
|
||
/** Allocated an area of locked memory for bus master DMA operations. | ||
/** Allocate an area of locked memory for bus master DMA operations. | ||
On error, return -ENOMEM, and *pMemArea.size = 0 | ||
If allocation fails, return 1, and *pMemArea.size = 0 | ||
*/ | ||
int hpios_locked_mem_alloc(struct consistent_dma_area *p_mem_area, u32 size, | ||
u16 hpios_locked_mem_alloc(struct consistent_dma_area *p_mem_area, u32 size, | ||
struct pci_dev *pdev) | ||
{ | ||
/*?? any benefit in using managed dmam_alloc_coherent? */ | ||
|
@@ -62,7 +62,7 @@ int hpios_locked_mem_alloc(struct consistent_dma_area *p_mem_area, u32 size, | |
HPI_DEBUG_LOG(WARNING, | ||
"failed to allocate %d bytes locked memory\n", size); | ||
p_mem_area->size = 0; | ||
return -ENOMEM; | ||
return 1; | ||
} | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.