]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/log
mirror_ubuntu-bionic-kernel.git
15 years agoALSA: hda - Don't touch non-existent port f on 4-port 92hd71bxx codecs
Herton Ronaldo Krzesinski [Sun, 8 Feb 2009 21:51:28 +0000 (19:51 -0200)]
ALSA: hda - Don't touch non-existent port f on 4-port 92hd71bxx codecs

When checking for input amps on pins 0x0a, 0x0d and 0x0f, and
initializing them for 92hd71xxx codec models, we must skip nid 0x0f
for 4-port models too like with 5-port models, as it is unused
(nid 0x0f is vendor reserved in 4-port models).

Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Bind new ecs mobo id (1019:2950) to model=ecs202
Herton Ronaldo Krzesinski [Sun, 8 Feb 2009 21:50:34 +0000 (19:50 -0200)]
ALSA: hda - Bind new ecs mobo id (1019:2950) to model=ecs202

This adds a new sound quirk entry (model=ecs202) for an ecs motherboard
with IDT STAC9221 codec (1019:2950).

Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Fix unused variable compile warning
Takashi Iwai [Fri, 6 Feb 2009 16:34:03 +0000 (17:34 +0100)]
ALSA: hda - Fix unused variable compile warning

  sound/pci/hda/patch_realtek.c:12693: warning: unused variable ‘i’

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Use digital beep for AD codecs
Takashi Iwai [Fri, 6 Feb 2009 16:22:05 +0000 (17:22 +0100)]
ALSA: hda - Use digital beep for AD codecs

Use digital beep instead of analog pc-beep for AD codecs.
Create the beep mixer controls dynamically on demand.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Remove superfluous code in patch_realtek.c
Takashi Iwai [Fri, 6 Feb 2009 16:21:09 +0000 (17:21 +0100)]
ALSA: hda - Remove superfluous code in patch_realtek.c

codec->spec is reset in the caller side.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Clear codec->beep at release
Takashi Iwai [Fri, 6 Feb 2009 15:48:10 +0000 (16:48 +0100)]
ALSA: hda - Clear codec->beep at release

Clear codec->beep field in snd_hda_detach_beep_device() to be sure.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Add missing NULL check in snd_hda_create_spdif_in_ctls()
Takashi Iwai [Fri, 6 Feb 2009 15:21:20 +0000 (16:21 +0100)]
ALSA: hda - Add missing NULL check in snd_hda_create_spdif_in_ctls()

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'fix/hda' into topic/hda
Takashi Iwai [Fri, 6 Feb 2009 15:13:34 +0000 (16:13 +0100)]
Merge branch 'fix/hda' into topic/hda

15 years agoALSA: hda - Create beep mixer controls dynamically for Realtek codecs
Takashi Iwai [Fri, 6 Feb 2009 15:11:25 +0000 (16:11 +0100)]
ALSA: hda - Create beep mixer controls dynamically for Realtek codecs

Create beep mixer controls dynamically for Realtek codecs instead of
static arrays.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Add missing COEF initialization for ALC887
Takashi Iwai [Fri, 6 Feb 2009 11:46:59 +0000 (12:46 +0100)]
ALSA: hda - Add missing COEF initialization for ALC887

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Add missing initialization for ALC272
Takashi Iwai [Fri, 6 Feb 2009 11:45:52 +0000 (12:45 +0100)]
ALSA: hda - Add missing initialization for ALC272

ALC272 needs EAPD for speaker outputs as well as other similar ALC
codecs.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: enable concurrent digital outputs for ALC1200
Wu Fengguang [Fri, 6 Feb 2009 07:02:27 +0000 (15:02 +0800)]
ALSA: enable concurrent digital outputs for ALC1200

Add the SPDIF pin as slave digital out to enable concurrent
HDMI/SPDIF outputs for ASUS M3A-H/HDMI with ALC1200 codec.

Tested-by: Thomas Schneider <nailstudio@gmx.net>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Add missing KERN_* prefix to printk
Takashi Iwai [Thu, 5 Feb 2009 14:57:55 +0000 (15:57 +0100)]
ALSA: hda - Add missing KERN_* prefix to printk

... and disable the annoying debug message.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Add quirk for another HP laptop
Takashi Iwai [Thu, 5 Feb 2009 14:02:06 +0000 (15:02 +0100)]
ALSA: hda - Add quirk for another HP laptop

Add model=laptop entry for another HP laptop (103c:3077) with AD1984A.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Add quirk for HP zenith laptop
Takashi Iwai [Thu, 5 Feb 2009 11:14:52 +0000 (12:14 +0100)]
ALSA: hda - Add quirk for HP zenith laptop

Added model=laptop for another HP laptop (103c:3072) with AD1984A codec.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda: Added stac378x digital slave out struct
Matthew Ranostay [Wed, 4 Feb 2009 22:49:41 +0000 (17:49 -0500)]
ALSA: hda: Added stac378x digital slave out struct

Added the ADATOut nid to a slave digital outs struct to allow output
via the DigOut pin.

Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Don't call stac92xx_parse_auto_config with wrong dig_in
Herton Ronaldo Krzesinski [Wed, 4 Feb 2009 16:37:27 +0000 (11:37 -0500)]
ALSA: hda - Don't call stac92xx_parse_auto_config with wrong dig_in

Don't use uneeded/wrong third parameter for stac92xx_parse_auto_config
in patch_stac92hd71bxx (no SPDIF in).

Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Dynamic detection of dmics/dmuxes/smuxes in stac92hd71bxx
Herton Ronaldo Krzesinski [Wed, 4 Feb 2009 16:34:22 +0000 (11:34 -0500)]
ALSA: hda - Dynamic detection of dmics/dmuxes/smuxes in stac92hd71bxx

Detect the number of connected ports and number of smuxes dynamically,
looking at pin configs, using new introduced functions
stac92hd71bxx_connected_ports and stac92hd71bxx_connected_smuxes. Also
use proper input mux configuration for 4port and 5port models.

Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Additional pin nids for STAC92HD71Bx and STAC92HD75Bx codecs
Herton Ronaldo Krzesinski [Wed, 4 Feb 2009 16:23:19 +0000 (11:23 -0500)]
ALSA: hda - Additional pin nids for STAC92HD71Bx and STAC92HD75Bx codecs

Current code for STAC92HD71Bx and STAC92HD75Bx doesn't consider pin
complexes 0x20 and 0x27. Also for 4 port models, nids 0x0e and 0x0f
are vendor reserved. This commit changes code so it'll consider the
additional pin complexes for models that have it, and avoid reserved
nids to be touched on 4 port models.

Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'fix/hda' into topic/hda
Takashi Iwai [Thu, 5 Feb 2009 06:42:28 +0000 (07:42 +0100)]
Merge branch 'fix/hda' into topic/hda

15 years agoALSA: hda - Fix misc workqueue issues
Takashi Iwai [Thu, 5 Feb 2009 06:34:28 +0000 (07:34 +0100)]
ALSA: hda - Fix misc workqueue issues

Some fixes regarding snd-hda-intel workqueue:
- Use create_singlethread_workqueue() instead of create_workqueue()
  as per-CPU work isn't required.
- Allocate workq name string properly
- Renamed the workq name to "hd-audio*" to be more obvious.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'fix/hda' into topic/hda
Takashi Iwai [Wed, 4 Feb 2009 22:32:03 +0000 (23:32 +0100)]
Merge branch 'fix/hda' into topic/hda

15 years agoALSA: hda - Add quirk for FSC Amilo Xi2550
Takashi Iwai [Wed, 4 Feb 2009 22:30:19 +0000 (23:30 +0100)]
ALSA: hda - Add quirk for FSC Amilo Xi2550

Added model=fujisu-pi2515 for FSC Amilo Xi2550 with ALC883 codec.

Refernece: Novell bnc#450979
https://bugzilla.novell.com/show_bug.cgi?id=450979

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda: Add digital beep generator support for Realtek codecs.
Kusanagi Kouichi [Wed, 4 Feb 2009 15:00:58 +0000 (00:00 +0900)]
ALSA: hda: Add digital beep generator support for Realtek codecs.

A digital beep generator can be used via input layer.

Signed-off-by: Kusanagi Kouichi <slash@ma.neweb.ne.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: Document tyan model for Realtek ALC262
Tony Vroon [Tue, 3 Feb 2009 11:13:34 +0000 (11:13 +0000)]
ALSA: Document tyan model for Realtek ALC262

As just pointed out to me, the new tyan model for ALC262 was
implemented but not documented. This adds the board to the
list, using both its marketing name (Thunder n6650W) and its
model number (S2915-E).

Signed-off-by: Tony Vroon <tony@linx.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Add tyan model for Realtek ALC262
Tony Vroon [Mon, 2 Feb 2009 19:01:30 +0000 (19:01 +0000)]
ALSA: hda - Add tyan model for Realtek ALC262

The Realtek ALC262 on the Tyan Thunder n6650W (S2915-E) mainboard has a
rather odd configuration template. As a result, the white AUX connector
can not be used. This rewrites the default config to more accurately
reflect the connector layout, colour and function.
Unfortunately the black CD_IN connector, which is suspected to be widget
0x1c refuses to switch into input (0x20), instead opting to remain on 0x0.
As such, no mixer controls are exposed for it. Autoswitching is implemented
between the front headphone output and back line output.

Signed-off-by: Tony Vroon <tony@linx.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'fix/hda' into topic/hda
Takashi Iwai [Mon, 2 Feb 2009 10:43:36 +0000 (11:43 +0100)]
Merge branch 'fix/hda' into topic/hda

15 years agoALSA: hda - No widget selection for volume knob widgets in proc output
Takashi Iwai [Mon, 2 Feb 2009 10:37:03 +0000 (11:37 +0100)]
ALSA: hda - No widget selection for volume knob widgets in proc output

Volume-knob widgets have no widget selection although they have widget
connections.  Thus, the connection list in the proc output shouldn't
contain the selection (*).

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Add support of iMac 24 Aluminium
Mark Eggleston [Sat, 31 Jan 2009 16:57:54 +0000 (17:57 +0100)]
ALSA: hda - Add support of iMac 24 Aluminium

Added the support for 24" Aluminium iMac (106b:3e00)

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Add quirk for another HP dv5 model
Takashi Iwai [Fri, 30 Jan 2009 14:49:58 +0000 (15:49 +0100)]
ALSA: hda - Add quirk for another HP dv5 model

Added model=hp-dv5 for another HP dv5 model with AMD chip (103c:3600)

Reference: kernel bug#12440
http://bugzilla.kernel.org/show_bug.cgi?id=12440

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - make alc882_auto_init_input_src aware of selectors
Herton Ronaldo Krzesinski [Thu, 29 Jan 2009 15:18:31 +0000 (13:18 -0200)]
ALSA: hda - make alc882_auto_init_input_src aware of selectors

In the case of having a selector instead of mixer while initing input
sources, the case that happens with ALC889, we must select instead
of muting input. Problem was found while testing with hda-emu.

Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Consider additional capture source/selector in ALC889
Herton Ronaldo Krzesinski [Wed, 28 Jan 2009 11:16:33 +0000 (09:16 -0200)]
ALSA: hda - Consider additional capture source/selector in ALC889

Currently code for capture source support in ALC889 only considers
capture mixers. This change adds additional support for ADC+selector
present in ALC889, taking into account also the presence of an
additional DMIC connection item in the selector.

Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - add another MacBook Pro 4, 1 subsystem ID
Luke Yelavich [Wed, 28 Jan 2009 04:58:38 +0000 (15:58 +1100)]
ALSA: hda - add another MacBook Pro 4, 1 subsystem ID

Add another MacBook Pro 4,1 SSID (106b:3800). It seems that latter revisions,
(at least mine), have different IDs to earlier revisions.

Signed-off-by: Luke Yelavich <themuso@ubuntu.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Fix compile warning with CONFIG_SND_JACK=n
Takashi Iwai [Tue, 27 Jan 2009 11:53:22 +0000 (12:53 +0100)]
ALSA: hda - Fix compile warning with CONFIG_SND_JACK=n

  sound/pci/hda/patch_conexant.c:352: warning: 'conexant_add_jack' defined but not used

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Add quirk for HP DV6700 laptop
Joerg Schirottke [Tue, 27 Jan 2009 10:01:34 +0000 (11:01 +0100)]
ALSA: hda - Add quirk for HP DV6700 laptop

Added the matching model=laptop for HP DV6700 laptop.

Signed-off-by: Joerg Schirottke <master@kanotix.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda: 92hd71xxx disable unmute support for codecs that don't have input amps
Matthew Ranostay [Mon, 26 Jan 2009 14:33:52 +0000 (09:33 -0500)]
ALSA: hda: 92hd71xxx disable unmute support for codecs that don't have input amps

Some revisions of the 92hd71xxx codec families don't have input amps
on ports 0xa, 0xd and 0xf, so probe the widget caps on port 0xa and
check for support, if found run snd_hda_sequence_write_cache() on the
stac92hd71xxx_unmute_core_init verb list.

Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Fix wrong initial verb for AD1984 thinkpad model
Takashi Iwai [Fri, 23 Jan 2009 13:18:11 +0000 (14:18 +0100)]
ALSA: hda - Fix wrong initial verb for AD1984 thinkpad model

The docking mic-boost (0x25) has no mute bit.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Fix invalid amp init for ALC268 codec
Takashi Iwai [Fri, 23 Jan 2009 11:53:09 +0000 (12:53 +0100)]
ALSA: hda - Fix invalid amp init for ALC268 codec

Fix some invalid AMP initializations for ALC268 codecs.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Fix invalid verbs for mic-boosts on AD1884*
Takashi Iwai [Fri, 23 Jan 2009 11:37:09 +0000 (12:37 +0100)]
ALSA: hda - Fix invalid verbs for mic-boosts on AD1884*

The mic-boosts (0x14 and 0x15) on AD1884* codecs are input-amps,
not output-amps.  Fix the invalid initialization verbs.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Remove invalid amp initializations for AD1988* codecs
Takashi Iwai [Fri, 23 Jan 2009 11:35:25 +0000 (12:35 +0100)]
ALSA: hda - Remove invalid amp initializations for AD1988* codecs

The ADC widgets on AD1988* codecs have no amp controls.
Remove invalid initialization verbs.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Fix initial verbs for mic-boosts on AD1981HD
Takashi Iwai [Fri, 23 Jan 2009 11:33:54 +0000 (12:33 +0100)]
ALSA: hda - Fix initial verbs for mic-boosts on AD1981HD

The mic boosts (NID 0x08 and 0x18) are input-amps, not output-amps.
Fix the initial verbs for them.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Create "Input Source" control dynamically for STAC/IDT
Takashi Iwai [Fri, 23 Jan 2009 10:57:22 +0000 (11:57 +0100)]
ALSA: hda - Create "Input Source" control dynamically for STAC/IDT

Instead of fixed kcontrol_new element, build "Input Source" controls
dynamically.  If the number of input-source items is 0 or 1, we don't
need to create such a control.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'fix/hda' into topic/hda
Takashi Iwai [Fri, 23 Jan 2009 10:55:52 +0000 (11:55 +0100)]
Merge branch 'fix/hda' into topic/hda

15 years agoALSA: hda - Fix PCM reference NID for STAC/IDT analog outputs
Takashi Iwai [Fri, 23 Jan 2009 10:55:42 +0000 (11:55 +0100)]
ALSA: hda - Fix PCM reference NID for STAC/IDT analog outputs

The reference NID for the analog outputs of STAC/IDT codecs is set
to a fixed number 0x02.  But this isn't always correct and in many
codecs it points to a non-existing NID.

This patch fixes the initialization of the PCM reference NID taken
from the actually probed DAC list.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Add model=ref for Intel board with STAC9221
Takashi Iwai [Fri, 23 Jan 2009 08:09:43 +0000 (09:09 +0100)]
ALSA: hda - Add model=ref for Intel board with STAC9221

An intel board (8086:0204) works only with model=ref.

Reference: Novell bug #406529
https://bugzilla.novell.com/show_bug.cgi?id=406529

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda: add reference board SND_PCI_QUIRK
Matthew Ranostay [Fri, 23 Jan 2009 03:55:44 +0000 (22:55 -0500)]
ALSA: hda: add reference board SND_PCI_QUIRK

Add another LanParty reference board SND_PCI_QUIRK to quirk lists of
all codec families.

Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoAdd PCI DFI vendor ID
Matthew Ranostay [Wed, 21 Jan 2009 22:45:12 +0000 (17:45 -0500)]
Add PCI DFI vendor ID

Add a define for DFI PCI vendor id.

Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'fix/hda' into topic/hda
Takashi Iwai [Fri, 23 Jan 2009 07:07:51 +0000 (08:07 +0100)]
Merge branch 'fix/hda' into topic/hda

15 years agoALSA: hda: Add STAC92HD83XXX_PWR_REF quirk
Matthew Ranostay [Fri, 23 Jan 2009 01:53:29 +0000 (20:53 -0500)]
ALSA: hda: Add STAC92HD83XXX_PWR_REF quirk

Some revisions of the 92hd8xxx codec's not supporting port power
downs in which the using of it causes capture and also randomly
playback streams to not function at all. Thus by disabling it by
default and adding a option to enable it manually will fix all issue
on current and future revisions.

Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda: revert change to 92hd83xxx power mapping
Matthew Ranostay [Fri, 23 Jan 2009 01:38:42 +0000 (20:38 -0500)]
ALSA: hda: revert change to 92hd83xxx power mapping

Port 0xe power mapping was incorrect set to 0x80 changed to the correct
value 0x40.

Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Add quirk for Gateway %1616 laptop
Takashi Iwai [Thu, 22 Jan 2009 16:40:18 +0000 (17:40 +0100)]
ALSA: hda - Add quirk for Gateway %1616 laptop

Gateway T1616 laptop needs EAPD always on while the current STAC9205
code turns off per HP plug.  Added a new model "eapd" to keep it on.

Reference: Novell bnc#467597
https://bugzilla.novell.com/show_bug.cgi?id=467597

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'fix/hda' into topic/hda
Takashi Iwai [Thu, 22 Jan 2009 16:10:22 +0000 (17:10 +0100)]
Merge branch 'fix/hda' into topic/hda

15 years agoALSA: hda - Avoid to set the pin control again if already set
Takashi Iwai [Thu, 22 Jan 2009 15:59:20 +0000 (16:59 +0100)]
ALSA: hda - Avoid to set the pin control again if already set

Check the present pin control bit and avoid the write if it's already
set in patch_sigmatel.c.  This will reduce the number of verb execs at
jack plugging.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Add model entry for HP dv4
Takashi Iwai [Thu, 22 Jan 2009 11:58:11 +0000 (12:58 +0100)]
ALSA: hda - Add model entry for HP dv4

Added model=hp-dv5 for HP dv4 (103c:30f7).

Reference: kernel bug #12440
http://bugzilla.kernel.org/show_bug.cgi?id=12440

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'test/hda-vol-ofs' into next/hda
Takashi Iwai [Thu, 22 Jan 2009 07:33:04 +0000 (08:33 +0100)]
Merge branch 'test/hda-vol-ofs' into next/hda

15 years agoALSA: hda - Remove old models for STAC9872 from the document
Takashi Iwai [Wed, 21 Jan 2009 06:43:23 +0000 (07:43 +0100)]
ALSA: hda - Remove old models for STAC9872 from the document

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Clean up old VAIO hack codes for STAC9872
Takashi Iwai [Wed, 21 Jan 2009 06:41:22 +0000 (07:41 +0100)]
ALSA: hda - Clean up old VAIO hack codes for STAC9872

Get rid of old VAIO static hack codes for STAC9872 and use the BIOS
auto-parser for all models.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'topic/hda' into next/hda
Takashi Iwai [Wed, 21 Jan 2009 06:34:08 +0000 (07:34 +0100)]
Merge branch 'topic/hda' into next/hda

15 years agoALSA: hda: 83xxx port 0xe DAC selection
Matthew Ranostay [Tue, 20 Jan 2009 21:50:25 +0000 (16:50 -0500)]
ALSA: hda: 83xxx port 0xe DAC selection

On the 92hd8xxx codecs port 0xe needs the connection selected to be the
last DAC in the list.

Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Allow digital-only I/O on ALC262 codec
Takashi Iwai [Tue, 20 Jan 2009 17:32:55 +0000 (18:32 +0100)]
ALSA: hda - Allow digital-only I/O on ALC262 codec

Some laptops like VAIO have multiple codecs and uses ALC262 only for
the SPIDF output without analog I/O.  So far, the codec-parser assumes
the presence of analog I/O and returned an error for such a case.

This patch adds some hacks to allow the digital-only configuration for
ALC262.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Assign proper digital I/O type for STAC/IDT
Takashi Iwai [Tue, 20 Jan 2009 17:30:20 +0000 (18:30 +0100)]
ALSA: hda - Assign proper digital I/O type for STAC/IDT

Assign the proper PCM digital I/O type (HDA_PCM_TYPE_*) for the digital
I/O on STAC/IDT codecs.  HDA_PCM_TYPE_HDMI is assigned for the HDMI I/O.

A similar framework is implemented to patch_realtek.c, but it's not
set up and still using only HDA_PCM_TYPE_SPDIF yet.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Check HDMI jack types in the auto configuration
Takashi Iwai [Tue, 20 Jan 2009 17:24:13 +0000 (18:24 +0100)]
ALSA: hda - Check HDMI jack types in the auto configuration

Add dig_out_type and dig_in_type fields to autocfg struct.
A proper HDA_PCM_TYPE_* value is assigned to these fields according
to the pin-jack location type value.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Don't break the PCM creation loop
Takashi Iwai [Tue, 20 Jan 2009 17:21:23 +0000 (18:21 +0100)]
ALSA: hda - Don't break the PCM creation loop

Don't break the loop in snd_hda_codec_build_pcms() even if the item
has no substreams.

It's possible that it's an empty item and the next item containing
the valid substreams (e.g. realtek codecs may create the analog
and alt-analog but no digitl streams).

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Improve auto-probing of STAC9872 codec
Takashi Iwai [Tue, 20 Jan 2009 16:19:01 +0000 (17:19 +0100)]
ALSA: hda - Improve auto-probing of STAC9872 codec

Use the standard STAC/IDT auto-probing routine for non-static
STAC9872 codec probing.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Detect non-SPDIF digital I/O
Takashi Iwai [Tue, 20 Jan 2009 16:17:29 +0000 (17:17 +0100)]
ALSA: hda - Detect non-SPDIF digital I/O

Accept non-SPDIF digital I/O pins as the digital pins.
These are usually corresponding to HDMI I/O.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Add debug prints for digital I/O pin detections
Takashi Iwai [Tue, 20 Jan 2009 16:15:57 +0000 (17:15 +0100)]
ALSA: hda - Add debug prints for digital I/O pin detections

Add the debug prints for digital I/O pin detections in
snd_hda_parse_pin_def_config() function.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Halve too large volume scales for STAC/IDT codecs
Takashi Iwai [Tue, 20 Jan 2009 14:28:38 +0000 (15:28 +0100)]
ALSA: hda - Halve too large volume scales for STAC/IDT codecs

STAC/IDT codecs have often too large volume scales such as -96dB,
and exposing this as is results in too large scale in percentage
representation.

This patch adds the check of the volume scale and halves the
volume range if it's too large automatically.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Add extra volume offset to standard volume amp macros
Takashi Iwai [Tue, 20 Jan 2009 12:07:55 +0000 (13:07 +0100)]
ALSA: hda - Add extra volume offset to standard volume amp macros

Added the volume offset to base for the standard volume controls
to handle elements with too big volume scales like -96dB..0dB.
For such elements, you can set the base volume to reduce the range.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda: fix invalid power mapping masks
Matthew Ranostay [Sat, 17 Jan 2009 23:47:27 +0000 (18:47 -0500)]
ALSA: hda: fix invalid power mapping masks

Fixed invalid power mappings for ports 0xd and 0xe on 93hd83xxx codecs.
They were shifted right one too many bits.

Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - add quirks for some 82801H variants to use ALC883_MITAC
Luke Yelavich [Fri, 16 Jan 2009 04:08:02 +0000 (15:08 +1100)]
ALSA: hda - add quirks for some 82801H variants to use ALC883_MITAC

Add the 82801H variants 1071:8227 and 8086:2503 to use ALC883_MITAC

Reference: Ubuntu bug 210865
    https://bugs.launchpad.net/bugs/210865

Signed-off-by: Luke Yelavich <themuso@ubuntu.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Fix (yet more) STAC925x issues
Takashi Iwai [Thu, 15 Jan 2009 16:31:00 +0000 (17:31 +0100)]
ALSA: hda - Fix (yet more) STAC925x issues

The codec-parsing of STAC925x was utterly broken due to its unique
design unlike other STAC codecs.  It has a volume control only in NID
0x0e (similar as STAC9200), but the parser assumes that the amp is
available on each DAC widget.

The patch fixes the whole wrong stories: fix the initial volume,
assign the fixed "Master" volume, and avoid to create wrong volume
controls.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Fix invalid amp value for STAC925x
Takashi Iwai [Thu, 15 Jan 2009 15:56:59 +0000 (16:56 +0100)]
ALSA: hda - Fix invalid amp value for STAC925x

The value set in the commit 2465fb6605b4f8f3964b132017bf4078d1265fe9
is actually wrong.  The value range is from 0 to 0x1f while the patch
sets to 0x7f.  Let's fix it.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Fix HP dv5 mic input
Takashi Iwai [Wed, 14 Jan 2009 07:27:35 +0000 (08:27 +0100)]
ALSA: hda - Fix HP dv5 mic input

Fix HP dv5 (103c:3603) built-in mic input.

Reference: kernel bug 12440
http://bugzilla.kernel.org/show_bug.cgi?id=12440

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Cc: stable@kernel.org
15 years agoALSA: hda - Fix missing initialization of NID 0x0e for STAC925x
Takashi Iwai [Wed, 14 Jan 2009 14:58:55 +0000 (15:58 +0100)]
ALSA: hda - Fix missing initialization of NID 0x0e for STAC925x

The selector widget 0x0e isn't initialized properly in the whole probe
process, thus it can be a wrong value depending on the BIOS setup.

This patch adds the init verb to set it to the max & unmuted.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Fix stac92hd83xxx_amp_nids[]
Takashi Iwai [Wed, 14 Jan 2009 08:40:25 +0000 (09:40 +0100)]
ALSA: hda - Fix stac92hd83xxx_amp_nids[]

Fix the bug introduced in commit c15c5060fc32d7de7cde76aa61e98bae1334d82e:
  sound/pci/hda/patch_sigmatel.c: In function ‘patch_stac92hd83xxx’:
  sound/pci/hda/patch_sigmatel.c:4765: warning: assignment from incompatible pointer type

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Add automatic model setting for Samsung Q45
Luke Yelavich [Tue, 16 Dec 2008 01:37:47 +0000 (12:37 +1100)]
ALSA: hda - Add automatic model setting for Samsung Q45

Have the Samsung Q45 (144d:c510) select ALC262_HIPPO by default

Reference: Ubuntu bug 200210
http://launchpad.net/bugs/200210

Signed-off-by: Luke Yelavich <themuso@ubuntu.com>
Cc: stable@kernel.org
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Don't reset HP pinctl in patch_sigmatel.c
Takashi Iwai [Wed, 14 Jan 2009 06:56:51 +0000 (07:56 +0100)]
ALSA: hda - Don't reset HP pinctl in patch_sigmatel.c

Resetting HP pinctl at the unplugged state may cause a sort of regression
on some devices because of their wrong pin configuration.

A simple workaround is to disable the pin reset.  This is ugly and may be
not good from the power-saving POV (if any), but damn simple.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Cc: stable@kernel.org
15 years agoALSA: hda: stac92hd8xxx amp mixers
Matthew Ranostay [Tue, 13 Jan 2009 18:30:07 +0000 (13:30 -0500)]
ALSA: hda: stac92hd8xxx amp mixers

Added amp nid for stac92hd8xxx families of codecs so the input amp
mixer is created.

Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Fix silent headphone output on Panasonic CF-74
Takashi Iwai [Fri, 9 Jan 2009 15:57:14 +0000 (16:57 +0100)]
ALSA: hda - Fix silent headphone output on Panasonic CF-74

CF-74 does the headphone/speaker switching on hardware, thus the driver
shouldn't do any software-toggling of pins.  Otherwise it results in a
silent headphone output.

This patch simply resets the hp_detect flag to fix the problem.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Update model descriptions in patch_sigmatel.c
Takashi Iwai [Tue, 13 Jan 2009 16:57:12 +0000 (17:57 +0100)]
ALSA: hda - Update model descriptions in patch_sigmatel.c

Update models in patch_sigmatel.c, mainly for the last Gateway updates.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoMerge branch 'topic/hda-gateway' into topic/hda
Takashi Iwai [Tue, 13 Jan 2009 16:50:46 +0000 (17:50 +0100)]
Merge branch 'topic/hda-gateway' into topic/hda

15 years agoALSA: hda - Use queue_delayed_work()
Takashi Iwai [Tue, 13 Jan 2009 16:46:37 +0000 (17:46 +0100)]
ALSA: hda - Use queue_delayed_work()

Replaced the old schedule_work() with queue_delayed_work() where
overlooked in the previous patches.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Add quirk for another HP dv5
Giuseppe Bilotta [Tue, 13 Jan 2009 13:58:49 +0000 (08:58 -0500)]
ALSA: hda - Add quirk for another HP dv5

Add the model=hp-m4 quirk for another HP dv5 (103c:3603)
Reference: kernel bug#12440
http://bugzilla.kernel.org/show_bug.cgi?id=12440

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Cc: stable@kernel.org
15 years agoALSA: hda - Add support of NVidia MCP78 HDMI
Takashi Iwai [Tue, 13 Jan 2009 11:32:21 +0000 (12:32 +0100)]
ALSA: hda - Add support of NVidia MCP78 HDMI

Added the new id for NVidia MCP HDMI (10de:0007).

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoALSA: hda - Fix a typo
Takashi Iwai [Tue, 13 Jan 2009 10:54:49 +0000 (11:54 +0100)]
ALSA: hda - Fix a typo

Fix a typo in stac92hd83xxx_cfg_tbl[].  The actual number is identical
thus there is no behavior change.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
15 years agoasync: fix __lowest_in_progress()
Arjan van de Ven [Sun, 11 Jan 2009 15:35:01 +0000 (15:35 +0000)]
async: fix __lowest_in_progress()

At 37000 feet somewhere near Greenland I woke up from a half-sleep with the
realisation that __lowest_in_progress() is buggy. After landing I checked
and there were indeed 2 problems with it; this patch fixes both:
* The order of the list checks was wrong
* The locking was not correct.

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
15 years agoscript: improve markup_oops.pl to also decode oopses in modules
Arjan van de Ven [Sun, 11 Jan 2009 15:03:23 +0000 (15:03 +0000)]
script: improve markup_oops.pl to also decode oopses in modules

There has been some light flamewar on lkml about decoding oopses
in modules (as part of the crashdump flamewar).

Now this isn't rocket science, just the markup_oops.pl script
cheaped out and didn't handle modules. But really; a flamewar
all about that?? What happened to C++ in the kernel or reading
files from inside the kernel?

This patch adds module support to markup_oops.pl; it's not the
most pretty perl but it works for my testcases...

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
15 years agoti_usb_3410_5052: add Multi-Tech firmware
Chris Adams [Sun, 11 Jan 2009 19:49:11 +0000 (19:49 +0000)]
ti_usb_3410_5052: add Multi-Tech firmware

Add the Multi-Tech cellular modem firmware to the TI USB serial driver.
This firmware was extracted from:

ftp://ftp.multitech.com/wireless/wireless_linux.zip

Firmware licence: "all firmware components are redistributable in binary
form" per support@multitech.com
Copyright (C) 2005 Multi-Tech Systems, Inc.

Signed-off-by: Chris Adams <cmadams@hiwaay.net>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
15 years agoti_usb_3410_5052: add Multi-Tech modem support
Chris Adams [Sun, 11 Jan 2009 19:49:00 +0000 (19:49 +0000)]
ti_usb_3410_5052: add Multi-Tech modem support

Add Multi-Tech cellular modem support to the ti_usb_3410_5052 driver.

Signed-off-by: Chris Adams <cmadams@hiwaay.net>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
15 years agoti_usb_3410_5052: support alternate firmware
Chris Adams [Sun, 11 Jan 2009 19:48:53 +0000 (19:48 +0000)]
ti_usb_3410_5052: support alternate firmware

The TI USB serial driver supports specifying alternate vendor and
product IDs (since the chips can and are used in devices under other
vendor/product IDs).  However, the alternate IDs were not loaded in the
combined product table.  This patch also adds support for loading
alternate firmware for alternate vendor/product IDs.

Signed-off-by: Chris Adams <cmadams@hiwaay.net>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
15 years agousb-serial: remove NULL check
Alan Cox [Sun, 11 Jan 2009 19:48:41 +0000 (19:48 +0000)]
usb-serial: remove NULL check

Julia Lawell found a case where a NULL check was misplaced in the
usb-serial code. However as the object in question cannot be NULL the
check can simply be removed.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
15 years agoneo: Remove a bogus NULL check
Alan Cox [Sun, 11 Jan 2009 19:48:34 +0000 (19:48 +0000)]
neo: Remove a bogus NULL check

Julia Lawall found an un-needed check in the neo driver. Her patch moves
the check to cover the code dereferencing it, however it cannot be NULL
anyway so remove the NULL check instead.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
15 years agopty: Fix documentation
Alan Cox [Sun, 11 Jan 2009 19:46:49 +0000 (19:46 +0000)]
pty: Fix documentation

The pty changes and updates for window sizing forgot to correct the
kerneldoc

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
15 years agoMerge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Tue, 13 Jan 2009 00:29:00 +0000 (16:29 -0800)]
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  kernel/sched.c: add missing forward declaration for 'double_rq_lock'
  sched: partly revert "sched debug: remove NULL checking in print_cfs_rt_rq()"
  cpumask: fix CONFIG_NUMA=y sched.c

15 years agoMerge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Tue, 13 Jan 2009 00:28:26 +0000 (16:28 -0800)]
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sparc64: Fix cpumask related build failure
  smp_call_function_single(): be slightly less stupid, fix
  smp_call_function_single(): be slightly less stupid
  rcu: fix bug in rcutorture system-shutdown code

15 years agoMerge branch 'for-next' of git://git.o-hand.com/linux-mfd
Linus Torvalds [Tue, 13 Jan 2009 00:27:24 +0000 (16:27 -0800)]
Merge branch 'for-next' of git://git.o-hand.com/linux-mfd

* 'for-next' of git://git.o-hand.com/linux-mfd:
  mfd: Fix twl4030-core build
  mfd: Ensure sm501 GPIO pin mode is GPIO when configured
  mfd: dm355 evm MMC/SD card detection
  regulator: PCF50633 pmic driver
  input: PCF50633 input driver
  power_supply: PCF50633 battery charger driver
  rtc: PCF50633 rtc driver
  mfd: PCF50633 gpio support
  mfd: PCF50633 adc driver
  mfd: PCF50633 core driver

15 years agoMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Linus Torvalds [Tue, 13 Jan 2009 00:25:35 +0000 (16:25 -0800)]
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (37 commits)
  MIPS: Only write c0_framemask on CPUs which have this register.
  MIPS: Alchemy: new userspace suspend interface for development boards.
  MIPS: Alchemy: dbdma suspend/resume support.
  MIPS: Alchemy: Fix up PM code on Au1550/Au1200
  MIPS: Alchemy: move calc_clock function.
  MIPS: Alchemy: RTC counter clocksource / clockevent support.
  MIPS: make cp0 counter clocksource/event usable as fallback.
  MIPS: Alchemy: remove cpu_table.
  MIPS: Alchemy: remove get/set_au1x00_lcd_clock().
  MIPS: Print irq handler description
  MIPS: Alchemy: pb1200: update CPLD cascade irq handler.
  MIPS: Alchemy: update core interrupt code.
  MIPS: Alchemy: move commandline mangling out of common code
  MIPS: Alchemy: devboards: consolidate files
  MIPS: Alchemy: Move development board code to common subdirectory
  MIPS: Add Cavium OCTEON to arch/mips/Kconfig
  MIPS: Add defconfig for Cavium OCTEON.
  MIPS: Adjust the dma-common.c platform hooks.
  MIPS: Add Cavium OCTEON slot into proper tlb category.
  MIPS:  Compute branch returns for Cavium OCTEON specific branch instructions.
  ...

15 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Tue, 13 Jan 2009 00:22:31 +0000 (16:22 -0800)]
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: (37 commits)
  ucc_geth: use correct UCCE macros
  net_dma: acquire/release dma channels on ifup/ifdown
  cxgb3: Keep LRO off if disabled when interface is down
  sfc: SFT9001: Fix condition for LNPGA power-off
  dccp ccid-3: Fix RFC reference
  smsc911x: register irq with device name, not driver name
  smsc911x: fix smsc911x_reg_read compiler warning
  forcedeth: napi schedule lock fix
  net: fix section mismatch warnings in dccp/ccids/lib/tfrc.c
  forcedeth: remove mgmt unit for mcp79 chipset
  qlge: Remove dynamic alloc of rx ring control blocks.
  qlge: Fix schedule while atomic issue.
  qlge: Remove support for device ID 8000.
  qlge: Get rid of split addresses in hardware control blocks.
  qlge: Get rid of volatile usage for shadow register.
  forcedeth: version bump and copyright
  forcedeth: xmit lock fix
  netdev: missing validate_address hooks
  netdev: add missing set_mac_address hook
  netdev: gianfar: add MII ioctl handler
  ...

15 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Tue, 13 Jan 2009 00:22:12 +0000 (16:22 -0800)]
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:
  sparc: Fix asm/signal.h for 32-bit.
  sparc: Eliminate PROMLIB_INTERNAL as it does nothing
  sparc: Kill exports of prom internal functions
  sparc64: move EXPORT_SYMBOL to the symbols definition
  sparc: move EXPORT_SYMBOL to the symbols definition
  sparc: Create a new file lib/ksyms.c and add export of all symbols defined in assembler in lib/ to this file.
  sparc: Most unaligned_64.c tweaks for branch tracer warnings.
  sparc: Fix sun4d_irq.c build.
  sparc: Update 32-bit defconfig.
  sparc64: fix warnings in psycho_common after ull conversion

15 years agoMerge branch 'for_2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/kkeil...
Linus Torvalds [Mon, 12 Jan 2009 23:57:34 +0000 (15:57 -0800)]
Merge branch 'for_2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6

* 'for_2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6:
  Fix small typo
  misdn: indentation and braces disagree - add braces
  misdn: one handmade ARRAY_SIZE converted
  drivers/isdn/hardware/mISDN: move a dereference below a NULL test
  indentation & braces disagree - add braces
  Make parameter debug writable
  BUGFIX: used NULL pointer at ioctl(sk,IMGETDEVINFO,&devinfo) when devinfo.id not registered