]> pilppa.com Git - linux-2.6-omap-h63xx.git/log
linux-2.6-omap-h63xx.git
16 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...
Linus Torvalds [Thu, 24 Apr 2008 16:33:34 +0000 (09:33 -0700)]
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: (85 commits)
  Blackfin char driver for Blackfin on-chip OTP memory (v3)
  Blackfin Serial Driver: fix bug - use mod_timer to replace only add_timer.
  Blackfin Serial Driver: the uart break anomaly has been given its own number, so switch to it
  Blackfin Serial Driver: use BFIN_UART_NR_PORTS to help SIR driver in uart port.
  Blackfin Serial Driver: Fix bug - kernel hangs when accessing uart 0 on bf537 when booting u-boot and linux on uart 1
  Blackfin Serial Driver: punt unused lsr variable
  Blackfin Serial Driver: Enable IR function when user application (irattach /dev/ttyBFx -s) call TIOCSETD ioctl with line discipline N_IRDA
  [Blackfin] arch: add include/boot .gitignore files
  [Blackfin] arch: Functional power management support: Add support for cpu frequency scaling
  [Blackfin] arch: Functional power management support: Remove broken cpu frequency scaling drivers
  [Blackfin] arch: Equalize include files: Add PLL_DIV Masks
  [Blackfin] arch: Add a warning about the value of CLKIN.
  [Blackfin] arch: take DDR DEVWD into consideration as well for BF548
  [Blackfin] arch: Remove the circular buffering mechanism for exceptions
  [Blackfin] arch: lose unnecessary dependency on CONFIG_BFIN_ICACHE for MPU
  [Blackfin] arch: fix bug - before assign new channel to the map register, need clear the bits first.
  [Blackfin] arch: add Blackfin on-chip SIR IrDA driver support
  [Blackfin] arch: BF54x memsizes are in mbits, not mbytes
  [Blackfin] arch: try to remove condition that causes double fault, by checking current before it gets dereferenced
  [Blackfin] arch: Update anomaly list.
  ...

16 years agoBlackfin char driver for Blackfin on-chip OTP memory (v3)
Mike Frysinger [Fri, 25 Apr 2008 00:04:56 +0000 (08:04 +0800)]
Blackfin char driver for Blackfin on-chip OTP memory (v3)

initial char driver for otp memory
(only read supported atm ... needs real examples/docs for write support)

v2-v3:
 - fixup __initdata with __initconst, as we are heading for 2.6.26

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Acked-by: Jiri Slaby <jirislaby@gmail.com>
16 years agoBlackfin Serial Driver: fix bug - use mod_timer to replace only add_timer.
Sonic Zhang [Thu, 24 Apr 2008 20:36:47 +0000 (04:36 +0800)]
Blackfin Serial Driver: fix bug - use mod_timer to replace only add_timer.

http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=4045
If adding timer in both timer handler and rx interrupt, a timer may be
added when it is till in the pending list.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
16 years agoBlackfin Serial Driver: the uart break anomaly has been given its own number, so...
Mike Frysinger [Thu, 24 Apr 2008 19:03:03 +0000 (03:03 +0800)]
Blackfin Serial Driver: the uart break anomaly has been given its own number, so switch to it

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
16 years agoBlackfin Serial Driver: use BFIN_UART_NR_PORTS to help SIR driver in uart port.
Graf Yang [Thu, 24 Apr 2008 18:55:49 +0000 (02:55 +0800)]
Blackfin Serial Driver: use BFIN_UART_NR_PORTS to help SIR driver in uart port.

Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
16 years agoMerge branch 'irq-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Thu, 24 Apr 2008 15:42:21 +0000 (08:42 -0700)]
Merge branch 'irq-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6

* 'irq-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  arm/mach-integrator/time.c, mwave: revert portions of recent irq cleanups

16 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
Linus Torvalds [Thu, 24 Apr 2008 15:41:44 +0000 (08:41 -0700)]
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (250 commits)
  [ALSA] ice1724 - Fix IRQ lock-up with MPU access
  [ALSA] Define MPU401 registers in sound/mpu401_uart.h
  [ALSA] pcsp: fix wording in DEBUG_PAGEALLOC warning
  [ALSA] pcsp - Fix dependency in Kconfig
  [ALSA] soc - ac97 - Clean up checkpatch warnings
  [ALSA] soc - wm8750 - Clean up checkpatch warnings
  [ALSA] soc - wm8731 - Clean up checkpatch warnings
  [ALSA] soc - pxa2xx-pcm - Fix checkpatch warnings
  [ALSA] soc - spitz - Fix checkpatch warnings
  [ALSA] soc - poodle - Fix checkpatch warnings
  [ALSA] soc - corgi - Fix checkpatch warnings
  [ALSA] soc - s3c24xx-i2s - Add missing spaces
  [ALSA] soc - s3c24xx-i2s - Fix tab/space breakage
  [ALSA] soc - s3c24xx-i2s - Use linux/io.h
  [ALSA] hda - Fix Thinkpad X300 digital mic
  pcsp - Don't build pcspkr when snd-pcsp is enabled
  [ALSA] hda - Fix model for Acer Aspire 5720z
  [ALSA] soc - s3c24xx - Declare suspend and resume static
  [ALSA] soc - s3c24xx - Improve diagnostic output
  [ALSA] Fix possible races at free_irq in PCI drivers
  ...

16 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Thu, 24 Apr 2008 15:40:34 +0000 (08:40 -0700)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (22 commits)
  tun: Multicast handling in tun_chr_ioctl() needs proper locking.
  [NET]: Fix heavy stack usage in seq_file output routines.
  [AF_UNIX] Initialise UNIX sockets before general device initcalls
  [RTNETLINK]: Fix bogus ASSERT_RTNL warning
  iwlwifi: Fix built-in compilation of iwlcore (part 2)
  tun: Fix minor race in TUNSETLINK ioctl handling.
  ppp_generic: use stats from net_device structure
  iwlwifi: Don't unlock priv->mutex if it isn't locked
  wireless: rndis_wlan: modparam_workaround_interval is never below 0.
  prism54: prism54_get_encode() test below 0 on unsigned index
  mac80211: update mesh EID values
  b43: Workaround DMA quirks
  mac80211: fix use before check of Qdisc length
  net/mac80211/rx.c: fix off-by-one
  mac80211: Fix race between ieee80211_rx_bss_put and lookup routines.
  ath5k: Fix radio identification on AR5424/2424
  ssb: Fix all-ones boardflags
  b43: Add more btcoexist workarounds
  b43: Fix HostFlags data types
  b43: Workaround invalid bluetooth settings
  ...

16 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Thu, 24 Apr 2008 15:37:29 +0000 (08:37 -0700)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: (23 commits)
  sparc: sunzilog uart order
  [SPARC64]: Detect trap frames in stack backtraces.
  [SPARC64]: %l6 trap return handling no longer necessary.
  [SPARC64]: Use trap type stored in pt_regs to handle syscall restart.
  [SPARC64]: Store magic cookie and trap type in pt_regs.
  [SPARC64]: PROM debug console can be CON_ANYTIME.
  sparc64: cleanup after SunOS/Solaris binary emulation removal
  sparc: cleanup after SunOS binary emulation removal
  [SPARC64]: Add NUMA support.
  [SPARC64]: Allocate TSB node-local.
  [SPARC64]: NUMA device infrastructure.
  [SPARC64]: Kill pci_iommu_table_init() declaration.
  [SPARC64]: Once we have the boot cmdline, call parse_early_param()
  [SPARC64]: Remove unused asm-sparc64/numnodes.h
  [SPARC64]: Decrease SECTION_SIZE_BITS to 30.
  [SPARC64]: Initialize MDESC earlier and use lmb_alloc()
  [SPARC64]: Use lmb_alloc() for PROM device tree.
  [SPARC64]: Call real_setup_per_cpu_areas() earlier and use lmb_alloc().
  [SPARC64]: Fully use LMB information in bootmem_init().
  [SPARC64]: Start using LMB information in bootmem_init().
  ...

16 years agoMerge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Thu, 24 Apr 2008 15:36:11 +0000 (08:36 -0700)]
Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] fix 48d7927bdf071d05cf5d15b816cf06b0937cb84f
  [ARM] 5010/1: htc-pasic3: remove unused defines and includes
  [ARM] pxa: fix 0e623941bec7e80c97b076d346327b31ae17d84a
  [ARM] fix lh7a40x/kev7a400 build

16 years agoalpha: unbreak OSF/1 (a.out) binaries
Ivan Kokshaysky [Thu, 24 Apr 2008 12:54:50 +0000 (16:54 +0400)]
alpha: unbreak OSF/1 (a.out) binaries

OSF/1 brk(2) was broken by following one-liner in sys_brk()
(commit 4cc6028d4040f95cdb590a87db478b42b8be0508):

- if (brk < mm->end_code)
+ if (brk < mm->start_brk)
goto out;

The problem is that osf_set_program_attributes()
does update mm->end_code, but not mm->start_brk,
which still contains inappropriate value left from
binary loader, so brk() always fails.

Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
16 years agoalpha: fix legacy mode PCI IDE controllers
Ivan Kokshaysky [Thu, 24 Apr 2008 12:51:55 +0000 (16:51 +0400)]
alpha: fix legacy mode PCI IDE controllers

Legacy IDE resources were never properly allocated on most
alpha platforms, so IDE expectedly stopped working after
commit 10f000a2fd805e8ccfe988e8615545467bb7f7df (generic
pci_enable_resources).

Always allocate "fixed" PCI resources before doing anything else;
remove Cypress IDE quirk, as it's a generic problem which is
handled in common PCI probe code.

Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Acked-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
16 years agoarm/mach-integrator/time.c, mwave: revert portions of recent irq cleanups
Jeff Garzik [Thu, 24 Apr 2008 12:35:37 +0000 (08:35 -0400)]
arm/mach-integrator/time.c, mwave: revert portions of recent irq cleanups

The recent irq cleanups for arch/arm/mach-integrator/time.c and
drivers/char/mwave/tp3780i.c changed the request_irq() dev_id
parameter, but neglected to change the matching free_irq() parameter,
thus creating a bug upon irq de-registration.

Given that the impetus for the changes is not yet accepted upstream,
it is best to revert the irq cleanups.

Mostly.  A comment is added to time.c to reduce future confusion,
of type that led to my time.c cleanup in the first place.

Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
16 years agotun: Multicast handling in tun_chr_ioctl() needs proper locking.
David S. Miller [Thu, 24 Apr 2008 10:44:43 +0000 (03:44 -0700)]
tun: Multicast handling in tun_chr_ioctl() needs proper locking.

Since these operations don't go through the normal
device calls, we have to ensure we synchronize with
those paths.

Noticed by Alan Cox.

Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[ALSA] ice1724 - Fix IRQ lock-up with MPU access
Takashi Iwai [Wed, 23 Apr 2008 15:47:28 +0000 (17:47 +0200)]
[ALSA] ice1724 - Fix IRQ lock-up with MPU access

The sound boards with VT1724 and compatible chips may lock up when
MPU401 is accessed together with the PCM streaming.
This patch fixes the problem.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] Define MPU401 registers in sound/mpu401_uart.h
Takashi Iwai [Wed, 23 Apr 2008 15:47:28 +0000 (17:47 +0200)]
[ALSA] Define MPU401 registers in sound/mpu401_uart.h

Define some MPU401 registers in sound/mpu401_uart.h so that other
drivers can refer to them.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] pcsp: fix wording in DEBUG_PAGEALLOC warning
Stas Sergeev [Wed, 23 Apr 2008 15:16:38 +0000 (17:16 +0200)]
[ALSA] pcsp: fix wording in DEBUG_PAGEALLOC warning

Signed-off-by: Stas Sergeev <stsp@aknet.ru>
(fixed invalid KERN_WARNING by tiwai)
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] pcsp - Fix dependency in Kconfig
Takashi Iwai [Wed, 23 Apr 2008 15:08:58 +0000 (17:08 +0200)]
[ALSA] pcsp - Fix dependency in Kconfig

Added the proper dependency to Kconfig for snd-pcsp driver.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years agosparc: sunzilog uart order
Robert Reif [Thu, 24 Apr 2008 10:37:51 +0000 (03:37 -0700)]
sparc: sunzilog uart order

I have a sparcstation 20 clone with a lot of on board serial ports.
The serial core code assumes that uarts are assigned contiguously
and that may not be the case when there are multiple zs devices
present.  This patch insures that uart chips are placed in front of
keyboard/mouse chips in the port table.

ffd37420: ttyS0 at MMIO 0xf1100000 (irq = 44) is a zs (ESCC)
Console: ttyS0 (SunZilog zs0)
console [ttyS0] enabled
ffd37420: ttyS1 at MMIO 0xf1100004 (irq = 44) is a zs (ESCC)
ffd37500: Keyboard at MMIO 0xf1000000 (irq = 44) is a zs
ffd37500: Mouse at MMIO 0xf1000004 (irq = 44) is a zs
ffd3c5c0: ttyS2 at MMIO 0xf1100008 (irq = 44) is a zs (ESCC)
ffd3c5c0: ttyS3 at MMIO 0xf110000c (irq = 44) is a zs (ESCC)
ffd3c6a0: ttyS4 at MMIO 0xf1100010 (irq = 44) is a zs (ESCC)
ffd3c6a0: ttyS5 at MMIO 0xf1100014 (irq = 44) is a zs (ESCC)
ffd3c780: ttyS6 at MMIO 0xf1100018 (irq = 44) is a zs (ESCC)
ffd3c780: ttyS7 at MMIO 0xf110001c (irq = 44) is a zs (ESCC)

Signed-off-by: Robert Reif <reif@earthlink.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[SPARC64]: Detect trap frames in stack backtraces.
David S. Miller [Thu, 24 Apr 2008 10:28:52 +0000 (03:28 -0700)]
[SPARC64]: Detect trap frames in stack backtraces.

Now that we have a magic cookie in the pt_regs, we can
properly detect trap frames in stack bactraces.

Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[SPARC64]: %l6 trap return handling no longer necessary.
David S. Miller [Thu, 24 Apr 2008 10:15:22 +0000 (03:15 -0700)]
[SPARC64]: %l6 trap return handling no longer necessary.

Now that we indicate the "restart system call" in the
trap type field of pt_regs->magic, we don't need to
set the %l6 boolean in all of the trap return paths.

And we therefore don't need to pass it to do_notify_resume().

Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[SPARC64]: Use trap type stored in pt_regs to handle syscall restart.
David S. Miller [Thu, 24 Apr 2008 10:01:48 +0000 (03:01 -0700)]
[SPARC64]: Use trap type stored in pt_regs to handle syscall restart.

Now that we can check the trap type directly, we don't need the
funny restart_syscall indication from the trap return paths.

Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[ALSA] soc - ac97 - Clean up checkpatch warnings
Mark Brown [Wed, 23 Apr 2008 13:26:45 +0000 (15:26 +0200)]
[ALSA] soc - ac97 - Clean up checkpatch warnings

Also change some if (x == NULL) to if (!x).

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] soc - wm8750 - Clean up checkpatch warnings
Mark Brown [Wed, 23 Apr 2008 13:17:12 +0000 (15:17 +0200)]
[ALSA] soc - wm8750 - Clean up checkpatch warnings

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] soc - wm8731 - Clean up checkpatch warnings
Mark Brown [Wed, 23 Apr 2008 13:16:46 +0000 (15:16 +0200)]
[ALSA] soc - wm8731 - Clean up checkpatch warnings

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] soc - pxa2xx-pcm - Fix checkpatch warnings
Mark Brown [Wed, 23 Apr 2008 13:14:18 +0000 (15:14 +0200)]
[ALSA] soc - pxa2xx-pcm - Fix checkpatch warnings

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] soc - spitz - Fix checkpatch warnings
Mark Brown [Wed, 23 Apr 2008 13:13:33 +0000 (15:13 +0200)]
[ALSA] soc - spitz - Fix checkpatch warnings

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] soc - poodle - Fix checkpatch warnings
Mark Brown [Wed, 23 Apr 2008 13:13:04 +0000 (15:13 +0200)]
[ALSA] soc - poodle - Fix checkpatch warnings

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] soc - corgi - Fix checkpatch warnings
Mark Brown [Wed, 23 Apr 2008 13:12:19 +0000 (15:12 +0200)]
[ALSA] soc - corgi - Fix checkpatch warnings

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] soc - s3c24xx-i2s - Add missing spaces
Mark Brown [Wed, 23 Apr 2008 13:10:28 +0000 (15:10 +0200)]
[ALSA] soc - s3c24xx-i2s - Add missing spaces

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] soc - s3c24xx-i2s - Fix tab/space breakage
Mark Brown [Wed, 23 Apr 2008 13:09:57 +0000 (15:09 +0200)]
[ALSA] soc - s3c24xx-i2s - Fix tab/space breakage

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] soc - s3c24xx-i2s - Use linux/io.h
Mark Brown [Wed, 23 Apr 2008 13:09:31 +0000 (15:09 +0200)]
[ALSA] soc - s3c24xx-i2s - Use linux/io.h

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] hda - Fix Thinkpad X300 digital mic
Takashi Iwai [Wed, 23 Apr 2008 11:50:08 +0000 (13:50 +0200)]
[ALSA] hda - Fix Thinkpad X300 digital mic

TP X300 digital mic requires additional init verbs with magic COEFs.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years agopcsp - Don't build pcspkr when snd-pcsp is enabled
Stas Sergeev [Wed, 23 Apr 2008 08:50:32 +0000 (10:50 +0200)]
pcsp - Don't build pcspkr when snd-pcsp is enabled

- Update CREDITS with the pc-speaker driver authors.
- Prevent pcspkr from being built together with snd-pcsp.
  Both pcspkr and snd-pcsp use the same platform driver name "pcspkr".

Signed-off-by: Stas Sergeev <stsp@aknet.ru>
16 years ago[ALSA] hda - Fix model for Acer Aspire 5720z
Takashi Iwai [Tue, 22 Apr 2008 17:39:49 +0000 (19:39 +0200)]
[ALSA] hda - Fix model for Acer Aspire 5720z

Set the proper model=acer for Acer Aspire 5720z with ALC268 codec.
ALSA bug#3550:
https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3550

Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] soc - s3c24xx - Declare suspend and resume static
Mark Brown [Tue, 22 Apr 2008 16:27:22 +0000 (18:27 +0200)]
[ALSA] soc - s3c24xx - Declare suspend and resume static

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] soc - s3c24xx - Improve diagnostic output
Tim Niemeyer [Tue, 22 Apr 2008 16:26:59 +0000 (18:26 +0200)]
[ALSA] soc - s3c24xx - Improve diagnostic output

Add some debug messages for suspend/resume and to add a clear prefix to
s3c24xx-i2s and s3c24xx-pcm.

Signed-off-by: Tim Niemeyer <reddog@mastersword.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] Fix possible races at free_irq in PCI drivers
Takashi Iwai [Tue, 22 Apr 2008 15:28:11 +0000 (17:28 +0200)]
[ALSA] Fix possible races at free_irq in PCI drivers

The irq handler of PCI drivers must be released before releasing other
resources since the handler for a shared irq can be still called and
may access the freed resource again.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] soc - neo1973_wm8753 - Fix module unload
Tim Niemeyer [Tue, 22 Apr 2008 15:10:23 +0000 (17:10 +0200)]
[ALSA] soc - neo1973_wm8753 - Fix module unload

Signed-off-by: Tim Niemeyer <reddog@mastersword.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] pxa2xx-ac97: Support PXA3xx AC97
Mark Brown [Tue, 22 Apr 2008 15:09:49 +0000 (17:09 +0200)]
[ALSA] pxa2xx-ac97: Support PXA3xx AC97

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] soc - Support PXA3xx AC97
Mark Brown [Tue, 22 Apr 2008 15:08:52 +0000 (17:08 +0200)]
[ALSA] soc - Support PXA3xx AC97

The PXA3xx does not support the use of interrupts during reset and access
to the GPIO status requires similar handling to that for PXA27x.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] ice1712 - Add Terrasoniq TS88 support
Peter Lienig [Tue, 22 Apr 2008 15:05:07 +0000 (17:05 +0200)]
[ALSA] ice1712 - Add Terrasoniq TS88 support

Added the support of Terrasonq TS88.

Signed-off-by: Peter Lienig <lienig@rheinmetall-de.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] Fix synchronize_irq() bugs, redundancies
Jeff Garzik [Tue, 22 Apr 2008 11:50:34 +0000 (13:50 +0200)]
[ALSA] Fix synchronize_irq() bugs, redundancies

free_irq() calls synchronize_irq() for you, so there is no need for
drivers to manually do the same thing (again).  Thus, calls where
sync-irq immediately precedes free-irq can be simplified.

However, during this audit several bugs were noticed, where free-irq is
preceded by a "irq >= 0" check... but the sync-irq call is not covered
by the same check.

So, where sync-irq could not be eliminated completely, the missing check
was added.

Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] Audiophile 192: Fix ad converter initialization
Karsten Wiese [Tue, 22 Apr 2008 10:53:12 +0000 (12:53 +0200)]
[ALSA] Audiophile 192: Fix ad converter initialization

Correct some arguments in calls to snd_ice1712_gpio_write_bits() from
ap192_set_rate_val().

Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] Don't set gpio mask register in snd_ice1712_gpio_write_bits()
Karsten Wiese [Tue, 22 Apr 2008 10:52:45 +0000 (12:52 +0200)]
[ALSA] Don't set gpio mask register in snd_ice1712_gpio_write_bits()

Some calls to snd_ice1712_gpio_write() go wrong, if
snd_ice1712_gpio_write_bits() ran before and changed the gpio mask register.
Read the actual gpio value and combine it with the to be set bits in the cpu
instead.

Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] ice1724.c: toggle "chip reset" and "eeprom based setup" sequence
Karsten Wiese [Tue, 22 Apr 2008 10:52:15 +0000 (12:52 +0200)]
[ALSA] ice1724.c: toggle "chip reset" and "eeprom based setup" sequence

Let "chip reset" become first. Increasement of the "chip reset" related timeout
leads to correctly read eeprom's contents here.

Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years agoOSS: dmabuf: fix negative DMAbuf_get_buffer_pointer() check
Roel Kluin [Fri, 18 Apr 2008 10:25:41 +0000 (12:25 +0200)]
OSS: dmabuf: fix negative DMAbuf_get_buffer_pointer() check

Since unsigned active_offs < 0 is even true when DMAbuf_get_buffer_pointer()
returns negative

Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] SOC: fix tests in cs4270_hw_params()
Roel Kluin [Thu, 17 Apr 2008 16:58:34 +0000 (18:58 +0200)]
[ALSA] SOC: fix tests in cs4270_hw_params()

cs4270_hw_params does several times:

ret = snd_soc_write()
if (ret < 0)
...

This only works when ret is signed.

Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] usb-audio - Fix race in reconnection
Takashi Iwai [Thu, 17 Apr 2008 10:53:26 +0000 (12:53 +0200)]
[ALSA] usb-audio - Fix race in reconnection

Fix the race at reconnection of the device.
The disconnected usb_chip[] must be cleared before the next probe
call properly.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] Clean up snd_card_free*()
Takashi Iwai [Thu, 17 Apr 2008 10:52:02 +0000 (12:52 +0200)]
[ALSA] Clean up snd_card_free*()

A little clean up of snd_card_free*().
Removed snd_card_free_prepare() since it's actually almost identical
with snd_card_disconnect().

Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] Fix the race of card instance unregistration
Takashi Iwai [Thu, 17 Apr 2008 10:50:47 +0000 (12:50 +0200)]
[ALSA] Fix the race of card instance unregistration

Move the call of device_unregister() for the card instance in
snd_card_disconnect() to avoid the race of sysfs card entry, which
can be typically found on usb-audio reconnection.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] snd-powermac: style burgundy.c
Risto Suominen [Wed, 16 Apr 2008 17:45:51 +0000 (19:45 +0200)]
[ALSA] snd-powermac: style burgundy.c

Coding style corrections for burgundy.c.

Signed-off-by: Risto Suominen <Risto.Suominen@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] snd-powermac: Burgundy mixers for B&W and iMac
Risto Suominen [Wed, 16 Apr 2008 17:45:31 +0000 (19:45 +0200)]
[ALSA] snd-powermac: Burgundy mixers for B&W and iMac

Add mixer controls and correct headphone detection bits for PowerMac
G3 B&W and iMac G3 Tray-loading, both having Burgundy chipset.

Signed-off-by: Risto Suominen <Risto.Suominen@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] snd-powermac: style awacs.s and awacs.h
Risto Suominen [Wed, 16 Apr 2008 17:39:27 +0000 (19:39 +0200)]
[ALSA] snd-powermac: style awacs.s and awacs.h

Coding style corrections for awacs.c and awacs.h.

Signed-off-by: Risto Suominen <Risto.Suominen@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] snd-powermac: AWACS and Screamer mixers for PM7500, Beige, and iMac SL
Risto Suominen [Thu, 17 Apr 2008 15:55:30 +0000 (17:55 +0200)]
[ALSA] snd-powermac: AWACS and Screamer mixers for PM7500, Beige, and iMac SL

Add mixer controls and correct headphone detection bits for PowerMacs
7300/7500 (AWACS) and G3 Beige (Screamer), and iMac G3 Slot-loading
(Screamer).

Signed-off-by: Risto Suominen <Risto.Suominen@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] snd-powermac: style pmac.c
Risto Suominen [Wed, 16 Apr 2008 11:16:05 +0000 (13:16 +0200)]
[ALSA] snd-powermac: style pmac.c

Coding style corrections for pmac.c.

Signed-off-by: Risto Suominen <Risto.Suominen@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] snd-powermac: enable headphone detection
Risto Suominen [Wed, 16 Apr 2008 11:15:38 +0000 (13:15 +0200)]
[ALSA] snd-powermac: enable headphone detection

Enable port change interrupt while initialising AWACS, Screamer, and
Burgundy chipsets.

Signed-off-by: Risto Suominen <Risto.Suominen@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] sound/drivers/dummy.c: fix negative snd_pcm_format_width() check
Roel Kluin [Wed, 16 Apr 2008 17:30:30 +0000 (19:30 +0200)]
[ALSA] sound/drivers/dummy.c: fix negative snd_pcm_format_width() check

bps is unsigned, a negative snd_pcm_format_width() return value is not noticed

Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] hda - Avoid unexpected breakage with ALC889A hack
Takashi Iwai [Wed, 16 Apr 2008 15:29:09 +0000 (17:29 +0200)]
[ALSA] hda - Avoid unexpected breakage with ALC889A hack

The last ALC889A hack may break on some devices with certain model presets
since patch_alc*() have different model tables.  So, now it's handled in
the original patch_alc882() but fly to patch_alc883() in model=auto
appropriately.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] hda - Fix ALC889A codec support
Takashi Iwai [Wed, 16 Apr 2008 12:13:29 +0000 (14:13 +0200)]
[ALSA] hda - Fix ALC889A codec support

ALC889A is recognized ALC885/ALC882 but it's actually closer to
ALC888/ALC883.

Cc: Kasper Sandberg <lkml@metanurb.dk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] hda: Add 5.1 support for second headphone jack
Matthew Ranostay [Wed, 16 Apr 2008 11:13:59 +0000 (13:13 +0200)]
[ALSA] hda: Add 5.1 support for second headphone jack

Several 92hd7xxx and STAC9228 laptops have multiple headphone jacks,
the second headphone jack should be used for the 5.1 surround sound.
Add support for 'Headphone as Line Out' switch, which allows it be used
in 5.1 surround sound.

Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] soc - wm9712: Remove unneeded AC97_EXTENDED_MID updates
Mark Brown [Wed, 16 Apr 2008 10:59:55 +0000 (12:59 +0200)]
[ALSA] soc - wm9712: Remove unneeded AC97_EXTENDED_MID updates

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] oxygen: generalize DAC volume TLV handling
Clemens Ladisch [Wed, 16 Apr 2008 07:15:45 +0000 (09:15 +0200)]
[ALSA] oxygen: generalize DAC volume TLV handling

Add a pointer for DAC volume TLV data to the model structure so that the
model driver do not need to manually assign it in their control filter.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] oxygen: mute by default
Clemens Ladisch [Wed, 16 Apr 2008 07:14:30 +0000 (09:14 +0200)]
[ALSA] oxygen: mute by default

Initialize the playback volume controls as being muted and having
minimal volume.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] oxygen: generalize handling of DAC volume limits
Clemens Ladisch [Wed, 16 Apr 2008 07:13:36 +0000 (09:13 +0200)]
[ALSA] oxygen: generalize handling of DAC volume limits

Add fields for the DAC volume limits to the module structure so that
model drivers do not need to install their own control info handlers.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] hifier: remove empty hifier_mixer_init()
Clemens Ladisch [Wed, 16 Apr 2008 07:12:27 +0000 (09:12 +0200)]
[ALSA] hifier: remove empty hifier_mixer_init()

The empty hifier_mixer_init() function is useless; remove it.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] hda - Add support of AD1989A/AD1989B
Takashi Iwai [Tue, 15 Apr 2008 16:46:42 +0000 (18:46 +0200)]
[ALSA] hda - Add support of AD1989A/AD1989B

Added the support of AD1989A and AD1989B codecs.
These codecs can have multiple SPDIF devices, but currently we handle
only one SPDIF.  If any real devices with two SPDIF interfaces (likely
one for SPDIF and one for HDMI), we'll fix this rightly.

Otherwise, these codecs are pretty similar with AD1988.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] sound/core.h: evil #ifdefs
Pavel Machek [Mon, 14 Apr 2008 16:31:35 +0000 (18:31 +0200)]
[ALSA] sound/core.h: evil #ifdefs

snd_minor_info_oss_* is an function returning int _or_ comment,
depending on config parameters. That is truly evil, fix it.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] virtuoso: fix DX front panel I/O
Clemens Ladisch [Tue, 15 Apr 2008 06:57:31 +0000 (08:57 +0200)]
[ALSA] virtuoso: fix DX front panel I/O

Fix the GPIO 1 mixer control to enable I/O through the front panel
connector of the Xonar DX.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] snd_usb_caiaq: make high sample rates work with A8DJ
Daniel Mack [Mon, 14 Apr 2008 13:40:31 +0000 (15:40 +0200)]
[ALSA] snd_usb_caiaq: make high sample rates work with A8DJ

This patch for snd_usb_caiaq makes sample rates higher dann 48KHz work
with devices which have more than 2 stereo input/output pairs.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] snd_usb_caiaq: correct input channel order
Daniel Mack [Mon, 14 Apr 2008 13:39:47 +0000 (15:39 +0200)]
[ALSA] snd_usb_caiaq: correct input channel order

This patch corrects the input channel order of hardware supported by
snd_usb_caiaq.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] snd_usb_caiaq: fix potential lockups locking
Daniel Mack [Mon, 14 Apr 2008 13:39:14 +0000 (15:39 +0200)]
[ALSA] snd_usb_caiaq: fix potential lockups locking

This patch fixes potential lockups in snd_usb_caiaq by refining the
locking mechanims and by using usb_kill_urb() in favor to
usb_unlink_urb().

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] ASoC: Add support for 19.2 MHz MCLK in TLV320AIC3X
Jarkko Nikula [Mon, 14 Apr 2008 13:28:19 +0000 (15:28 +0200)]
[ALSA] ASoC: Add support for 19.2 MHz MCLK in TLV320AIC3X

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] wm9713: Don't control touch screen power on suspend
Mark Brown [Mon, 14 Apr 2008 13:27:30 +0000 (15:27 +0200)]
[ALSA] wm9713: Don't control touch screen power on suspend

Leave the power bit for the touch screen alone when suspending the WM9713
so that the touch screen driver can handle it. This allows the touch
screen to be used as a wakeup source when the system is suspended.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] sound: this amplifier only goes up to 7
Nick Andrew [Mon, 14 Apr 2008 13:22:11 +0000 (15:22 +0200)]
[ALSA] sound: this amplifier only goes up to 7

sound: kernel log levels are 0-7

Kernel log levels are 0-7, not 0-9.

Signed-off-by: Nick Andrew <nick@nick-andrew.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] hda-intel: Add Quanta IL1 ALC267 model
Herton Ronaldo Krzesinski [Mon, 14 Apr 2008 11:46:28 +0000 (13:46 +0200)]
[ALSA] hda-intel: Add Quanta IL1 ALC267 model

This adds support for Quanta IL1 mini-notebook to alsa, defining a new model
for it. It comes with an ALC267 codec chip. Some notes about this model:

* In headphone automute, I use AC_VERB_SET_PIN_WIDGET_CONTROL instead of common
  amp mute, to avoid conflict with mixer switch (mixer and automute use the
  same nid).
* The only connected capture sources in the hardware are the internal mic and
  external mic jack. So instead of using an input source selector like on other
  ALC268 models, the mic automute automatically switch between captures.

Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] sound: fix platform driver hotplug/coldplug
Kay Sievers [Mon, 14 Apr 2008 11:33:36 +0000 (13:33 +0200)]
[ALSA] sound: fix platform driver hotplug/coldplug

Since 43cc71eed1250755986da4c0f9898f9a635cb3bf, the platform modalias is
prefixed with "platform:".  Add MODULE_ALIAS() to the hotpluggable sound
platform drivers, to re-enable auto loading.

[dbrownell@users.sourceforge.net: more drivers, registration fixes]

Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] hda: EAPD power management
Matthew Ranostay [Mon, 14 Apr 2008 11:32:54 +0000 (13:32 +0200)]
[ALSA] hda: EAPD power management

Power management support for EAPD enabled laptops, when headphones
are sensed it pulls the EAPD GPIO line low to power it down.

Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] hda: Correct SPDIF out default config
Matthew Ranostay [Mon, 14 Apr 2008 11:32:27 +0000 (13:32 +0200)]
[ALSA] hda: Correct SPDIF out default config

Several laptops have have the SPDIF out defined as 'Digital other out'
when it should be 'SPDIF out' in the default config.

Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] hda - Fujitsu Lifebook PC speaker signal
Tony Vroon [Mon, 14 Apr 2008 11:31:45 +0000 (13:31 +0200)]
[ALSA] hda - Fujitsu Lifebook PC speaker signal

The legacy PC speaker signal was not routed to outputs. The codec is not
prevented from powering down in this patch, although I suppose one could
argue that perhaps it should be. Let me know if anyone feels strongly one
way or the other.

Signed-off-by: Tony Vroon <tony@linx.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] hda - PCI quirk for laptop LG which use CMI9880
Jiang zhe [Mon, 14 Apr 2008 11:26:53 +0000 (13:26 +0200)]
[ALSA] hda - PCI quirk for laptop LG which use CMI9880

Please refer to [0003874] on the alsa mantis.
This patch added the pci quirk.

Signed-off-by: Jiang zhe <zhe.jiang@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] hda - Should use HDA_OUTPUT instead of HDA_INPUT to mute pin 15 of ALC880
Jiang zhe [Mon, 14 Apr 2008 11:26:21 +0000 (13:26 +0200)]
[ALSA] hda - Should use HDA_OUTPUT instead of HDA_INPUT to mute pin 15 of ALC880

To mute the output of Pin widget 15 in ALC880, we should use the
HDA_OUTPUT. However, current code looks like :
snd_hda_codec_amp_stereo(codec, 0x15, HDA_INPUT, 0, HDA_AMP_MUTE, bits);
It may be a misspelling.

Signed-off-by: Jiang zhe <zhe.jiang@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] sound/usb/usbaudio.c: coding style
Pavel Machek [Mon, 14 Apr 2008 11:15:56 +0000 (13:15 +0200)]
[ALSA] sound/usb/usbaudio.c: coding style

Putting space between ! and variable is a strange coding style, fix
that, also make it fit into 80 columns where that is easy.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] usb audio: make quirk handling more readable, and fix commented-out code
Pavel Machek [Mon, 14 Apr 2008 11:14:22 +0000 (13:14 +0200)]
[ALSA] usb audio: make quirk handling more readable, and fix commented-out code

usb audio contains useful  debugging code, protected by #if
0. Unfortunately, it will not compile because variable names changed;
fix it.

Dallas workaround is formatted in a way where it is not quite obvious
what is normal code and what is quirk. Reformat it to make it obvious.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] usb audio: Fix another Dallas quirk
Pavel Machek [Mon, 14 Apr 2008 11:12:47 +0000 (13:12 +0200)]
[ALSA] usb audio: Fix another Dallas quirk

Dallas USB speakers are buggy in more than one way. One of configs
they offer does not work at all.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] hda-codec - Fix unbalanced mutex
Frederik Deweerdt [Mon, 14 Apr 2008 11:11:44 +0000 (13:11 +0200)]
[ALSA] hda-codec - Fix unbalanced mutex

On Wed, Apr 02, 2008 at 08:19:29AM -0400, Miles Lane wrote:
> [   48.765906] [ BUG: bad unlock balance detected! ]
> [   48.765912] -------------------------------------
> [   48.765918] pulseaudio/4277 is trying to release lock
> (&codec->spdif_mutex) at:
> [   48.765930] [<c03031b7>] mutex_unlock+0x8/0xa
> [   48.765945] but there are no more locks to release!
> [   48.765950]
> [   48.765952] other info that might help us debug this:
> [   48.765959] 2 locks held by pulseaudio/4277:
> [   48.765965]  #0:  (&pcm->open_mutex){--..}, at: [<f89f134b>]
> snd_pcm_open+0xc1/0x1ba [snd_pcm]
> [   48.766003]  #1:  (&chip->open_mutex){--..}, at: [<f8b4f13d>]
> azx_pcm_open+0x36/0x184 [snd_hda_intel]
> [   48.766057]
> [   48.766059] stack backtrace:
> [   48.766066] Pid: 4277, comm: pulseaudio Not tainted 2.6.25-rc8-mm1 #12
> [   48.766086]  [<c013afc6>] print_unlock_inbalance_bug+0xce/0xd8
> [   48.766107]  [<c0109e1c>] ? save_stack_trace+0x1d/0x3b
> [   48.766130]  [<c012f54e>] ? __kernel_text_address+0x1b/0x27
> [   48.766146]  [<c0104533>] ? dump_trace+0xcd/0xd9
> [   48.766160]  [<c0109d9e>] ? save_stack_address+0x0/0x2c
> [   48.766176]  [<c013b80a>] ? find_usage_backwards+0xa4/0xc3
> [   48.766193]  [<c013cfb5>] lock_release_non_nested+0x84/0x120
> [   48.766209]  [<c03031b7>] ? mutex_unlock+0x8/0xa
> [   48.766222]  [<c013d1bb>] lock_release+0x16a/0x199
> [   48.766238]  [<c0303137>] __mutex_unlock_slowpath+0xa9/0x121
> [   48.766252]  [<c03031b7>] mutex_unlock+0x8/0xa
> [   48.766263]  [<f8b4ffd8>] snd_hda_multi_out_analog_open+0xd3/0xef
> [snd_hda_intel]

The following patch should fix it.

Cc: "Miles Lane" <miles.lane@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] es1968 - fix coding style in the last patch
Andrew Morton [Mon, 14 Apr 2008 11:09:33 +0000 (13:09 +0200)]
[ALSA] es1968 - fix coding style in the last patch

WARNING: braces {} are not necessary for single statement blocks
#40: FILE: sound/pci/es1968.c:1831:
+       if (diff > 1) {
+               __maestro_write(chip, IDR0_DATA_PORT, cp1);
+       }

total: 0 errors, 1 warnings, 35 lines checked

./patches/es1968-fix-jitter-on-some-maestro-cards.patch has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

Please run checkpatch prior to sending patches

Cc: Andreas Mueller <andreas@stapelspeicher.org>
Tested-by: Rene Herman <rene.herman@keyaccess.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] es1968: fix jitter on some maestro cards
Andreas Mueller [Mon, 14 Apr 2008 11:08:05 +0000 (13:08 +0200)]
[ALSA] es1968: fix jitter on some maestro cards

This patch suppresses jitter on several Maestro cards in stereo mode (ALSA of
course).

The patch is also incorporated in the *BSD drivers where I "ported" it from.

Without this patch most of the stereo audio gets out of sync and really
distorted (oss-emulation with mplayer at 48000khz worked somehow).

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] sound/pci/rme9652/hdspm.c: stop inlining largish static functions
Denys Vlasenko [Mon, 14 Apr 2008 11:04:18 +0000 (13:04 +0200)]
[ALSA] sound/pci/rme9652/hdspm.c: stop inlining largish static functions

sound/pci/rme9652/hdspm.c has unusually large number of static inline
functions - 22.

I looked through them and some of them seem to be too big to warrant inlining.

This patch removes "inline" from these static functions (regardless of number
of callsites - gcc nowadays auto-inlines statics with one callsite).

Size difference on 32bit x86:
   text    data     bss     dec     hex filename
  20437    2160     516   23113    5a49 linux-2.6-ALLYES/sound/pci/rme9652/hdspm.o
  18036    2160     516   20712    50e8 linux-2.6.inline-ALLYES/sound/pci/rme9652/hdspm.o

[coding fix by Takashi Iwai <tiwai@suse.de>]

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] soc - Include register in DAPM debug output
Mark Brown [Mon, 14 Apr 2008 10:59:27 +0000 (12:59 +0200)]
[ALSA] soc - Include register in DAPM debug output

When logging register changes in DAPM debug output include the register
number.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] hda-codec - PCI quirk for MSI laptop
Jiang zhe [Mon, 14 Apr 2008 10:58:57 +0000 (12:58 +0200)]
[ALSA] hda-codec - PCI quirk for MSI laptop

Please refer to [0003848] on the alsa mantis.
This patch adds the pci quirk and Mic-Int controller.

Signed-off-by: Jiang zhe <zhe.jiang@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] virtuoso: initialize two-wire control register
Clemens Ladisch [Fri, 11 Apr 2008 08:25:40 +0000 (10:25 +0200)]
[ALSA] virtuoso: initialize two-wire control register

On the Xonar DX, initialize all bits of the two-wire control register.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] virtuoso: add GPIO 1 mixer control
Clemens Ladisch [Fri, 11 Apr 2008 08:24:48 +0000 (10:24 +0200)]
[ALSA] virtuoso: add GPIO 1 mixer control

Add a mixer control for switching whatever it is that is connected to
GPIO pin 1 on the Xonar DX.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] oxygen: use SPDIF input only if present
Clemens Ladisch [Wed, 9 Apr 2008 07:16:33 +0000 (09:16 +0200)]
[ALSA] oxygen: use SPDIF input only if present

If the card model does not have a digital input or an AC97 codec,
disable the respective interrupt and mixer controls.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] virtuoso: correctly switch input jack on Xonar DX
Clemens Ladisch [Wed, 9 Apr 2008 07:16:14 +0000 (09:16 +0200)]
[ALSA] virtuoso: correctly switch input jack on Xonar DX

When selecting the capture source on the Xonar DX, the input jack must
be routed to either the line input or the microphone input by setting a
GPIO pin.  This requires an additional callback so that the model driver
can hook into the toggling of AC97 switches.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] virtuoso: add Xonar DX support
Clemens Ladisch [Mon, 7 Apr 2008 08:29:44 +0000 (10:29 +0200)]
[ALSA] virtuoso: add Xonar DX support

Add support for the Asus Xonar DX.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] virtuoso: fix typo
Clemens Ladisch [Mon, 7 Apr 2008 08:27:01 +0000 (10:27 +0200)]
[ALSA] virtuoso: fix typo

Fix a (fortunately harmless) typo.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] virtuoso: change card short name
Clemens Ladisch [Mon, 7 Apr 2008 08:26:45 +0000 (10:26 +0200)]
[ALSA] virtuoso: change card short name

Change the card short name to show to show the card name instead of the
chip name.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] virtuoso: set PCM1796 oversampling rate
Clemens Ladisch [Mon, 7 Apr 2008 08:26:26 +0000 (10:26 +0200)]
[ALSA] virtuoso: set PCM1796 oversampling rate

When playing data at 96 kHz or higher, reduce the DAC oversampling rate
to 32.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years ago[ALSA] virtuoso: move some code to xonar_common_init()
Clemens Ladisch [Mon, 7 Apr 2008 08:26:03 +0000 (10:26 +0200)]
[ALSA] virtuoso: move some code to xonar_common_init()

Move the code that is common to all Xonar models to a separate function,
and make it more generic in preparation for another model.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>