Commit Graph

181 Commits

Author SHA1 Message Date
Jesper Juhl
4d572776d4 [ALSA] Remove redundant NULL checks before kfree
Timer Midlevel,ALSA sequencer,ALSA<-OSS sequencer,Digigram VX core
I2C tea6330t,GUS Library,VIA82xx driver,VIA82xx-modem driver
CA0106 driver,CS46xx driver,EMU10K1/EMU10K2 driver,YMFPCI driver
Digigram VX Pocket driver,Common EMU synth,USB generic driver,USB USX2Y
Checking a pointer for NULL before calling kfree() on it is redundant,
kfree() deals with NULL pointers just fine.
This patch removes such checks from sound/

This patch also makes another, but closely related, change.
It avoids casting pointers about to be kfree()'ed.

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-06-22 12:27:43 +02:00
James Courtier-Dutton
6fd8b87f0e [ALSA] AC97 - renamed vendor/device to subvendor/subdevice where appropriate
Intel8x0 driver
To avoid confusion, the structure members vendor/device were renamed
to subvendor/subdevice, because we compare them with PCI subsystem vendor
and subsystem device.

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-06-22 12:27:37 +02:00
Jaroslav Kysela
69ad07cf98 [ALSA] AC97 - renamed vendor/device to subvendor/subdevice where appropriate
AC97 Codec,ATIIXP driver,VIA82xx driver
To avoid confusion, the structure members vendor/device were renamed
to subvendor/subdevice, because we compare them with PCI subsystem vendor
and subsystem device.

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-06-22 12:27:34 +02:00
Jaroslav Kysela
745cac56ba [ALSA] via82xx - added 0x1071/0x8399 to while list
VIA82xx driver
- 0x1071, 0x8399 == VIA_DXS_ENABLE
- Umax AB 595T (VIA K8N800A - VT8237)
- reporter: Honza Machacek <Hloupy.Honza@centrum.cz>

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-06-22 12:27:30 +02:00
Sasha Khapyorsky
5cbff89cbc [ALSA] Modem support for ALI5451
ALI5451 driver
This patch adds modem support for ali5451. Since it is same pci device
all is done in ali5451.c.

Signed-off-by: Sasha Khapyorsky <sashak@smlink.com>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-06-22 12:27:27 +02:00
Tobias Klauser
299676b1d7 [ALSA] sound/pci/ca0106: Use the DMA_32BIT_MASK constant
CA0106 driver
Use the DMA_32BIT_MASK constant from dma-mapping.h
when calling pci_set_dma_mask() or pci_set_consistent_dma_mask()
See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-06-22 12:27:24 +02:00
Sasha Khapyorsky
83a5b72ad7 [ALSA] PCI modem drivers update
ATIIXP-modem driver,Intel8x0-modem driver,VIA82xx-modem driver
Modem drivers (atiixp-modem, intel8x0m, via82xx-modem) migration
for using MC97 generic modem mixer for off-hook operation.

Signed-off-by: Sasha Khapyorsky <sashak@smlink.com>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-06-22 12:27:21 +02:00
Sasha Khapyorsky
87d61c290b [ALSA] MC97 modem mixer in sound/pci/ac97
AC97 Codec
Simple MC97 modem mixer with two common controls: Off-hook and CID,
and Si3056 MC specific control: Modem Speaker.

Signed-off-by: Sasha Khapyorsky <sashak@smlink.com>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-06-22 12:27:18 +02:00
James Courtier-Dutton
8fabab15dc [ALSA] Be more specific with which I2C channel to use.
CA0106 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-06-22 12:27:14 +02:00
James Courtier-Dutton
883130b476 [ALSA] Implement S32_LE(24bit) and 96000 capture rates etc.
CA0106 driver

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-06-22 12:27:12 +02:00
James Courtier-Dutton
ed144f3cdc [ALSA] Add Mic capture support.
CA0106 driver
Notes: This adds a new mixer item to switch between Mic and Line-in.

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-06-22 12:27:09 +02:00
James Courtier-Dutton
7199acdc74 [ALSA] Implement support for Line-in capture on SB Live 24bit.
CA0106 driver
Notes: MIC capture not tested yet.

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-06-22 12:27:06 +02:00
Jaroslav Kysela
da04b128cf Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git 2005-06-22 12:19:24 +02:00
Hugh Dickins
7c2f3fda56 [PATCH] rme96xx: fix PageReserved range
rme96xx busmaster_malloc miscalculates and fails to set PageReserved on any
page of char *buf; but busmaster_free does it right, so do the same (I
don't have the card, just noticed this while sifting for rmap BUGs).

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-21 18:46:20 -07:00
Jaroslav Kysela
fae6ec69c8 Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git 2005-06-21 07:39:41 -07:00
gregkh@suse.de
619e666b7e [PATCH] class: convert sound/* to use the new class api instead of class_simple
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-06-20 15:15:07 -07:00
Karsten Wiese
dcf78d80a6 [PATCH] usbusx2y: prevent oops & dead keyboard on usb unplugging while the device is being used
Without this patch, some usb kobjects, which are parents to the usx2y's
kobjects can be freed before the usx2y's.  This led to an oops in
get_kobj_path_length() and a dead keyboard, when the usx2y's kobjects
were freed.  The patch ensures the correct sequence.  Tested ok on
kernel 2.6.12-rc2.

Present in ALSA cvs

Signed-off-by: Karsten Wiese <annabellesgarden@yahoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-14 11:05:13 -07:00
Karsten Wiese
efa93dbedd [PATCH] usbaudio: prevent oops & dead keyboard on usb unplugging while the device is being used
Without this patch, some usb kobjects, which are parents to the usx2y's
kobjects can be freed before the usx2y's.  This led to an oops in
get_kobj_path_length() and a dead keyboard, when the usx2y's kobjects
were freed.  The patch ensures the correct sequence.  Tested ok on
kernel 2.6.12-rc2.

Present in ALSA cvs

Signed-off-by: Karsten Wiese <annabellesgarden@yahoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-14 11:05:13 -07:00
Linus Torvalds
45b30105e7 Automatic merge of 'for-linus' branch from
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input
2005-05-29 10:40:13 -07:00
Jaroslav Kysela
7028b09eec [ALSA] select ISAPNP for SND_INTERWAVE_STB target
ISA


Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-05-29 10:15:44 +02:00
Takashi Iwai
cdc5c53fde [ALSA] Fix compilation on 32bit arch
ALSA<-OSS emulation
Fix the division with int64 for 32bit architectures.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:15:30 +02:00
Arnaud Patard
a6c17ec89d [ALSA] emu10k1: add details for the audigy player box version
EMU10K1/EMU10K2 driver
Add details for the audigy player box version.

Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:15:27 +02:00
Takashi Iwai
8cfbbac6ad [ALSA] ice1724 - Add support of Chaintech AV-710
Documentation,ICE1724 driver
Add the support of Chaintech AV-710 to ice1724 driver.
The patch includes the WM-codec initialization fix by
Jaanus Kivistik <jaanus@no.spam.ee>.

Since both AV-710 and AMP Audio2000 have the same SSID, initialize
WM codecs as default for both devices.  In case it breaks Audio2000,
you can pass 'model=amp2000' option to avoid WM codec initialization.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:15:24 +02:00
Takashi Iwai
11ca9afcfe [ALSA] als4000 - Fix kernel panic with MPU401
ALS4000 driver
Fix kernel panic with als4000 when MPU401 is accessed.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:15:21 +02:00
Jaroslav Kysela
af0816139f [ALSA] alsa-oss - 2nd - improved readability
ALSA<-OSS emulation
Use 'long' for byte counters in snd_pcm_oss_bytes() snd_pcm_alsa_bytes().

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-05-29 10:15:17 +02:00
Jaroslav Kysela
bfc5bddb8e [ALSA] alsa-oss - improve readability of snd_pcm_oss_bytes() function
ALSA<-OSS emulation
Added bytes variable and do not use the frames argument as a temporaly
storage for the byte counter.

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-05-29 10:15:14 +02:00
Takashi Iwai
685c0dccad [ALSA] Add dxs_support for a Twinhead mobo
VIA82xx driver
Added dxs_support=4 for a Twinhead mobo.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:15:08 +02:00
Takashi Iwai
fc232c6e8d [ALSA] Fix a wrong bit set in AC1985 code
AC97 Codec
Fixed a wrong bit set in AD1985 surround jack controls.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:15:05 +02:00
Jaroslav Kysela
8e72ab349e [ALSA] Reverted last patch for SNDCTL_DSP_GETOPTR fix & possible overflow fix
ALSA<-OSS emulation
This reverts the last patch which wrongly mixes bytes and frames.
The real culprit might be the 32-bit overflow, so the return expression uses
64-bit values now in snd_pcm_oss_bytes().

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-05-29 10:15:03 +02:00
Roger Mach
c3a9cfac75 [ALSA] pcm_oss - fix SNDCTL_DSP_GETOPTR not working correctly
ALSA<-OSS emulation
This patch changes snd_pcm_oss_bytes() by adding a local variable
for the frames -> bytes conversion, which means that the frame count
is no longer corrupted by this conversion.

Signed-off-by: Roger Mach <bigmach@us.ibm.com>
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-05-29 10:14:59 +02:00
Takashi Iwai
71fe7b82db [ALSA] Fix ALC880 capture problems
HDA Codec driver
Fixed the capture on some ALC880 devices.
The node 0x07 is sometimes invalid as an ADC.  Also, the intialization
of ADC nodes are fixed on some models.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:14:56 +02:00
Takashi Iwai
033a1f1092 [ALSA] hda-code: Fix the array size of codec list
HDA Codec driver
Fixed the wrong array size of the codec pointer list.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:14:53 +02:00
Takashi Iwai
9baf6507ff [ALSA] Use standard form for URL
Sound Core
Use the standard form with <> for URL in Kconfig help texts.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:14:50 +02:00
Takashi Iwai
6214410047 [ALSA] Make docproc happy
PCM Midlevel
Make docproc happy by moving '#if 0' before comments.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:14:48 +02:00
Takashi Iwai
23854c3002 [ALSA] Add comments for
Sound Core
Added (minimal) comments for  in Kconfig, so that
configurators can choose this entry explicitly.

A more descriptive comment by someone else is appreciated...

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:14:45 +02:00
Takashi Iwai
c9bce91f90 [ALSA] Update documentation for ice1712 and ice1724
Documentation,ICE1712 driver
Updated the documentation for ice1712 and ice1724 drivers.
Added the device description for shuttle SN25P missing in the last patch.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:14:42 +02:00
Takashi Iwai
b9cce37411 [ALSA] Add Shuttle SN25P support
ICE1712 driver
Added the support for Shuttle SN25P.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:14:38 +02:00
Takashi Iwai
e6e514fa82 [ALSA] Add the vendor 0x1558 to PM whitelist of es1968
ES1968 driver
Added the vendor id 0x1558 to the power management whitelist of es1968 driver.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:11:41 +02:00
Adrian Bunk
209ac85d76 [ALSA] sound/isa/: cleanups
GUS Library
This patch contains the following possible cleanups:
- make needlesly global code static
- #if 0 the following unused global functions:
  - gus/gus_volume.c: snd_gf1_gvol_to_lvol_raw
  - gus/gus_volume.c: snd_gf1_calc_ramp_rate
  - gus/gus_volume.c: snd_gf1_compute_vibrato
  - gus/gus_volume.c: snd_gf1_compute_pitchbend
  - gus/gus_volume.c: snd_gf1_compute_freq
  - gus/gus_io.c: snd_gf1_i_adlib_write
  - gus/gus_io.c: snd_gf1_i_write_addr
  - gus/gus_io.c: snd_gf1_pokew
  - gus/gus_io.c: snd_gf1_peekw
  - gus/gus_io.c: snd_gf1_dram_setmem
  - gus/gus_io.c: snd_gf1_print_global_registers
  - gus/gus_io.c: snd_gf1_print_setup_registers
  - gus/gus_io.c: snd_gf1_peek_print_block
  - gus/gus_io.c: snd_gf1_print_setup_registers
  - gus/gus_io.c: snd_gf1_peek_print_block
- #if 0 the following unused global variable:
  - gus/gus_tables.h: snd_gf1_scale_table
- remove the following unneeded EXPORT_SYMBOL's:
  - gus/gus_main.c: snd_gf1_i_write16
  - gus/gus_main.c: snd_gf1_start
  - gus/gus_main.c: snd_gf1_stop

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:11:38 +02:00
James Courtier-Dutton
1baa705b75 [ALSA] Tidy up card recognition.
CA0106 driver


Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-05-29 10:11:35 +02:00
James Courtier-Dutton
8f55fbb0fd [ALSA] When the alsamixer says 'SPDIF Out [Off]', SPDIF output should be off and Analog output should be on.
CA0106 driver
         This fixes a bug whereby when the snd-ca0106 module first loads,
         alsamixer says 'SPDIF Out [Off]' but no analog sound comes from the speakers.

         This covers any bug reports that said things like
         'mixer fails to remember analog output on, when the system is rebooted.'

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-05-29 10:11:32 +02:00
James Courtier-Dutton
1f82941e82 [ALSA] Implement surround71 outputs on SB Live 24bit.
CA0106 driver
Notes: Requires updated alsa-lib.

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-05-29 10:11:29 +02:00
Ville Syrjala
82f008c2b6 [ALSA] maestro3: Add hardware volume control quirk list
Maestro3 driver
Add a hardware volume quirk list to the maestro3 driver. Details were
taken from the Windows driver. Hardware volume control is enabled only for
the systems in the list.

Signed-off-by: Ville Syrjala <syrjala@sci.fi>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:11:26 +02:00
Takashi Iwai
58c1f8acde [ALSA] Fix resume of via82xx-modem
VIA82xx-modem driver
Fix the resume of via82xx-modem, removing invalid __devinit.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:11:23 +02:00
Adrian Bunk
123992f728 [ALSA] sound/core/: possible cleanups
PCM Midlevel,ALSA Core,Timer Midlevel,ALSA sequencer,Virtual Midi
This patch contains the following possible cleanups:
- make needlessly global code static
- #if 0 the following unused global functions
- remove the following unneeded EXPORT_SYMBOL's

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:11:20 +02:00
Benjamin Herrenschmidt
5218064c88 [ALSA] ppc32: Fix Alsa PowerMac driver on old machines
PPC PMAC driver
The g5 support code broke some earlier models unfortunately as those
bail out early from the detect function, before the point where I added
the code to locate the PCI device for use with DMA allocations.

This patch fixes it.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:11:14 +02:00
Takashi Iwai
9502dcad6c [ALSA] Export missing snd_pcm_format_*()
PCM Midlevel
Export snd_pcm_format_size().  This function is used by some out-of-kernel
drivers.

Make snd_pcm_format_cpu_endian() macro for optimization.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:11:11 +02:00
Takashi Iwai
e5b3f45f5d [ALSA] Fix Mic/CLFE sharing on AD1985
AC97 Codec
Fixed Mic/CLFE jack sharing on AD1985 codec.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-05-29 10:11:07 +02:00
Clemens Ladisch
604cf49925 [ALSA] usb-audio - fix synchronization packet interval with Audigy 2 NX
USB generic driver
When a device does not provide the bRefresh field in its audio endpoint
descriptors, use the bInterval field instead.

Furthermore, increase the number of sync URBs for better queueing.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-05-29 10:11:03 +02:00
Clemens Ladisch
d3ff42fd2b [ALSA] usb-audio - claim all interfaces for Roland USB MIDI devices
USB generic driver
Many Roland USB MIDI devices have two interfaces that are currently not
used by the driver; claim them anyway.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-05-29 10:11:00 +02:00