]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
11 years agoALSA: hda - Remove static quirks for AD1988 codecs
Takashi Iwai [Thu, 4 Jul 2013 14:34:20 +0000 (16:34 +0200)]
ALSA: hda - Remove static quirks for AD1988 codecs

For removing static quirks for AD1988 variants, a new fixup defining
the 6stack pinconfig has been added for the buggy BIOS.  Other than
that, we can cut off straightforwardly.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoALSA: hda - Remove static quirks for AD1981 and AD1983 codecs
Takashi Iwai [Thu, 4 Jul 2013 13:48:04 +0000 (15:48 +0200)]
ALSA: hda - Remove static quirks for AD1981 and AD1983 codecs

These are relatively easy ones, as we already converted all static
quirks to the generic parser.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoALSA: hda - Remove static quirks for AD1884/1984 & variants
Takashi Iwai [Thu, 4 Jul 2013 13:36:56 +0000 (15:36 +0200)]
ALSA: hda - Remove static quirks for AD1884/1984 & variants

Since the necessary device-specific fixups for Thinkpad and HP devices
have been already ported, we can remove all static quirks for AD1884,
AD1984, AD1884A and AD1984A codecs.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoALSA: hda - Remove static quirks for AD1882
Takashi Iwai [Thu, 4 Jul 2013 13:16:31 +0000 (15:16 +0200)]
ALSA: hda - Remove static quirks for AD1882

Now the generic parser can work stably enough, we can get rid of the
static quirks.  Let's start from AD1882.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoALSA: hda - Add fixup for HP TouchSmart with AD1984A codec
Takashi Iwai [Thu, 4 Jul 2013 13:14:17 +0000 (15:14 +0200)]
ALSA: hda - Add fixup for HP TouchSmart with AD1984A codec

Ported from the static quirk.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoALSA: hda - Add fixup for Lenovo Thinkpad with AD1984 codec
Takashi Iwai [Thu, 4 Jul 2013 12:45:37 +0000 (14:45 +0200)]
ALSA: hda - Add fixup for Lenovo Thinkpad with AD1984 codec

Ported from the static quirk (model=thinkpad).

Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoALSA: hda - Add GPIO control to AD1884 HP fixup
Takashi Iwai [Thu, 4 Jul 2013 12:32:16 +0000 (14:32 +0200)]
ALSA: hda - Add GPIO control to AD1884 HP fixup

The AD1884 HP laptop/mobile quirks control GPIO1 bit as the primary
mute as well.  Add the similar control to ad1884 fixup for auto
parser, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoALSA: hda - Fix EAPD vmaster hook for AD1884 & co
Takashi Iwai [Thu, 4 Jul 2013 10:54:22 +0000 (12:54 +0200)]
ALSA: hda - Fix EAPD vmaster hook for AD1884 & co

ad1884_fixup_hp_eapd() tries to set the NID for controlling the
speaker EAPD from the pin configuration.  But the current code can't
work expectedly since it sets spec->eapd_nid before calling the
generic parser where the autocfg pins are set up.

This patch changes the function to set spec->eapd_nid after the
generic parser call while it sets vmaster hook unconditionally.  The
spec->eapd_nid check is moved in the hook function itself instead.

Cc: <stable@vger.kernel.org> [v3.9+]
Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoALSA: vmaster: Fix the regression of missing vmaster hook call
Takashi Iwai [Wed, 3 Jul 2013 12:01:32 +0000 (14:01 +0200)]
ALSA: vmaster: Fix the regression of missing vmaster hook call

The commit [1ca2f2ec: ALSA: vmaster: Add snd_ctl_sync_vmaster() helper
function] changed master_put() function and the check for the required
vmaster hook call is wrongly performed now, which results in the
missing hook call upon "Master Playback Switch" value changes.
This patch corrects the check logic.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoALSA: hda - Add Dell SSID to support Headset Mic recording
Kailang Yang [Mon, 1 Jul 2013 09:27:16 +0000 (11:27 +0200)]
ALSA: hda - Add Dell SSID to support Headset Mic recording

This is X5 Precision - Diesel platform.

Signed-off-by: Kailang Yang <kailang@realtek.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoMerge tag 'asoc-v3.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Takashi Iwai [Mon, 1 Jul 2013 09:23:13 +0000 (11:23 +0200)]
Merge tag 'asoc-v3.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Final updates for v3.11

A few final updates:

 - A couple of additional bug fixes for the AC'97 refactoring.
 - Some fixes for the ADAU1701 driver.

11 years agoMerge branch 'for-next' into for-linus
Takashi Iwai [Mon, 1 Jul 2013 08:27:25 +0000 (10:27 +0200)]
Merge branch 'for-next' into for-linus

Merge the whole changes for 3.11-rc1 merge

11 years agoMerge remote-tracking branch 'asoc/topic/x86' into asoc-next
Mark Brown [Sun, 30 Jun 2013 11:42:25 +0000 (12:42 +0100)]
Merge remote-tracking branch 'asoc/topic/x86' into asoc-next

11 years agoMerge remote-tracking branch 'asoc/topic/twl6040' into asoc-next
Mark Brown [Sun, 30 Jun 2013 11:42:25 +0000 (12:42 +0100)]
Merge remote-tracking branch 'asoc/topic/twl6040' into asoc-next

11 years agoMerge remote-tracking branch 'asoc/topic/tas5086' into asoc-next
Mark Brown [Sun, 30 Jun 2013 11:42:24 +0000 (12:42 +0100)]
Merge remote-tracking branch 'asoc/topic/tas5086' into asoc-next

11 years agoMerge remote-tracking branch 'asoc/topic/ext' into asoc-next
Mark Brown [Sun, 30 Jun 2013 11:42:24 +0000 (12:42 +0100)]
Merge remote-tracking branch 'asoc/topic/ext' into asoc-next

11 years agoMerge remote-tracking branch 'asoc/topic/adsp' into asoc-next
Mark Brown [Sun, 30 Jun 2013 11:42:24 +0000 (12:42 +0100)]
Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next

11 years agoMerge remote-tracking branch 'asoc/topic/adau1701' into asoc-next
Mark Brown [Sun, 30 Jun 2013 11:42:23 +0000 (12:42 +0100)]
Merge remote-tracking branch 'asoc/topic/adau1701' into asoc-next

11 years agoASoC: adau1701: remove control_data assignment
Daniel Mack [Thu, 27 Jun 2013 20:00:05 +0000 (22:00 +0200)]
ASoC: adau1701: remove control_data assignment

codec->control_data has to be left unset to make the ASoC core access
the regmap properly.

That bug slipped in during a rebase session of the driver refactoring.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: adau1701: more direct regmap usage
Daniel Mack [Thu, 27 Jun 2013 20:00:04 +0000 (22:00 +0200)]
ASoC: adau1701: more direct regmap usage

Replace calls to snd_soc_update_bits() with regmap_update_bits().

Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: ac97: fixup multi-platform AC'97 module build failure
Kevin Hilman [Fri, 28 Jun 2013 18:17:49 +0000 (11:17 -0700)]
ASoC: ac97: fixup multi-platform AC'97 module build failure

commit b047e1cc (ASoC: ac97: Support multi-platform AC'97) introduced
some build failures for modules wanting to access the generic
soc_ac97_ops.  For example:

ERROR: "soc_ac97_ops" [sound/soc/codecs/snd-soc-wm9712.ko] undefined!

To fix, export soc_ac97_ops to modules.

Cc: Mark Brown <broonie@linaro.org>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: pxa2xx: fixup multi-platform AC'97 build failures
Kevin Hilman [Fri, 28 Jun 2013 18:17:48 +0000 (11:17 -0700)]
ASoC: pxa2xx: fixup multi-platform AC'97 build failures

commit b047e1cc (ASoC: ac97: Support multi-platform AC'97) introduced
some build failures for the pxa2xx-ac97 support, fix them.

Cc: Mark Brown <broonie@linaro.org>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: tegra20-ac97: Remove unused variable
Thierry Reding [Fri, 28 Jun 2013 19:53:25 +0000 (21:53 +0200)]
ASoC: tegra20-ac97: Remove unused variable

With the conversion to devm_ioremap_resource() the memregion variable is
no longer used so it can be dropped.

Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: tegra20-ac97: Remove duplicate error message
Thierry Reding [Fri, 28 Jun 2013 19:53:24 +0000 (21:53 +0200)]
ASoC: tegra20-ac97: Remove duplicate error message

devm_ioremap_resource() already outputs an error message when any of the
operations it performs fails, so the duplicate in the caller can be
removed.

Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoALSA: usb-audio: Add Audio Advantage Micro II
Przemek Rudy [Thu, 27 Jun 2013 21:52:33 +0000 (23:52 +0200)]
ALSA: usb-audio: Add Audio Advantage Micro II

This patch is adding extensive support (beside standard usb audio class)
for Audio Advantage Micro II usb sound card.
Features included:
- Access to AES bits (so now sending the IEC61937 compliant stream is
possible).
- Mixer SPDIF control added to turn on/off the optical transmitter.

Signed-off-by: Przemek Rudy <prudy1@o2.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoMerge tag 'asoc-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Takashi Iwai [Fri, 28 Jun 2013 11:36:22 +0000 (13:36 +0200)]
Merge tag 'asoc-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: More updates for v3.11

Some more fixes and enhancements, and also a bunch of refectoring for
AC'97 support which enables more than one AC'97 controller driver to be
built in.

11 years agoMerge remote-tracking branch 'asoc/topic/x86' into asoc-next
Mark Brown [Fri, 28 Jun 2013 11:17:07 +0000 (12:17 +0100)]
Merge remote-tracking branch 'asoc/topic/x86' into asoc-next

11 years agoMerge remote-tracking branch 'asoc/topic/twl6040' into asoc-next
Mark Brown [Fri, 28 Jun 2013 11:17:06 +0000 (12:17 +0100)]
Merge remote-tracking branch 'asoc/topic/twl6040' into asoc-next

11 years agoMerge remote-tracking branch 'asoc/topic/tas5086' into asoc-next
Mark Brown [Fri, 28 Jun 2013 11:17:06 +0000 (12:17 +0100)]
Merge remote-tracking branch 'asoc/topic/tas5086' into asoc-next

11 years agoMerge remote-tracking branch 'asoc/topic/ext' into asoc-next
Mark Brown [Fri, 28 Jun 2013 11:17:05 +0000 (12:17 +0100)]
Merge remote-tracking branch 'asoc/topic/ext' into asoc-next

11 years agoMerge remote-tracking branch 'asoc/topic/adsp' into asoc-next
Mark Brown [Fri, 28 Jun 2013 11:17:05 +0000 (12:17 +0100)]
Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next

11 years agoMerge remote-tracking branch 'asoc/topic/adau1701' into asoc-next
Mark Brown [Fri, 28 Jun 2013 11:17:04 +0000 (12:17 +0100)]
Merge remote-tracking branch 'asoc/topic/adau1701' into asoc-next

11 years agoASoC: tas5086: fix Mid-Z implementation
Daniel Mack [Thu, 27 Jun 2013 19:59:11 +0000 (21:59 +0200)]
ASoC: tas5086: fix Mid-Z implementation

It turns out that the TAS5086 doesn't like channel start parts to be
empty, and if all channels are configured to Mid-Z, part 1 has to be
used.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: tas5086: fix TAS5086_CLOCK_CONTROL register size
Daniel Mack [Thu, 27 Jun 2013 19:59:10 +0000 (21:59 +0200)]
ASoC: tas5086: fix TAS5086_CLOCK_CONTROL register size

The TAS5086_CLOCK_CONTROL also has a size of 1 byte.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoALSA: Replace the magic number 44 with const
Takashi Iwai [Fri, 28 Jun 2013 09:56:49 +0000 (11:56 +0200)]
ALSA: Replace the magic number 44 with const

The char arrays with size 44 are for the name string of
snd_ctl_elem_id.  Define the constant and replace the raw numbers with
it for clarifying better.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoALSA: hda - Fix the max length of control name in generic parser
Takashi Iwai [Fri, 28 Jun 2013 09:51:32 +0000 (11:51 +0200)]
ALSA: hda - Fix the max length of control name in generic parser

add_control_with_pfx() in hda_generic.c assumes a shorter name string
for the control element, and this resulted in the truncation of the
long but valid string like "Headphone Surround Switch" in the middle.

This patch aligns the max size to the actual limit of snd_ctl_elem_id,
44.

Cc: <stable@vger.kernel.org> [v3.9+]
Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoALSA: hda - Guess what, it's two more Dell headset mic quirks
David Henningsson [Fri, 28 Jun 2013 09:09:56 +0000 (11:09 +0200)]
ALSA: hda - Guess what, it's two more Dell headset mic quirks

Add two more machines that need quirks for headset mics to work.

Tested-by: Shawn Wang <shawn.wang@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/1195636
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoALSA: hda - Yet another Dell headset mic quirk
David Henningsson [Fri, 28 Jun 2013 06:53:34 +0000 (08:53 +0200)]
ALSA: hda - Yet another Dell headset mic quirk

This quirk is needed for the headset mic to work on this Dell
machine.

BugLink: https://bugs.launchpad.net/bugs/1195597
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoMerge branch 'full-roland-support' of git://git.alsa-project.org/alsa-kprivate into...
Takashi Iwai [Fri, 28 Jun 2013 10:13:26 +0000 (12:13 +0200)]
Merge branch 'full-roland-support' of git://git.alsa-project.org/alsa-kprivate into for-next

For adding support for many Roland and Yamaha devices:
* 'full-roland-support' of git://git.alsa-project.org/alsa-kprivate:
  ALSA: usb-audio: add quirks for Roland QUAD/OCTO-CAPTURE
  ALSA: usb-audio: claim autodetected PCM interfaces all at once
  ALSA: usb-audio: remove superfluous Roland quirks
  ALSA: usb-audio: add MIDI port names for some Roland devices
  ALSA: usb-audio: add support for many Roland/Yamaha devices
  ALSA: usb-audio: detect implicit feedback on Roland devices
  ALSA: usb-audio: store protocol version in struct audioformat

11 years agoALSA: hda - Add support for ALC5505 DSP power-save mode
Kailang Yang [Fri, 28 Jun 2013 10:03:01 +0000 (12:03 +0200)]
ALSA: hda - Add support for ALC5505 DSP power-save mode

This patch adds the power-saving control for ALC5505 DSP on some
Realtek codecs.

Signed-off-by: Kailang Yang <kailang@realtek.com>
Tested-by: Mengdong Lin <mengdong.lin@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoASoC: mfld: Remove unused variable
Mark Brown [Fri, 28 Jun 2013 09:57:26 +0000 (10:57 +0100)]
ASoC: mfld: Remove unused variable

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoALSA: usb-audio: add quirks for Roland QUAD/OCTO-CAPTURE
Clemens Ladisch [Sun, 16 Jun 2013 16:27:56 +0000 (18:27 +0200)]
ALSA: usb-audio: add quirks for Roland QUAD/OCTO-CAPTURE

The Roland Quad/Octo-Capture devices use some unknown vendor-specific
mechanism to switch sample rates (and to manage other controls).  To
prevent the driver from attempting to use any other than the default
44.1 kHz sample rate, use quirks to hide the other alternate settings.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
11 years agoALSA: usb-audio: claim autodetected PCM interfaces all at once
Clemens Ladisch [Thu, 4 Apr 2013 19:43:57 +0000 (21:43 +0200)]
ALSA: usb-audio: claim autodetected PCM interfaces all at once

snd_card_register() registers all devices newly added since the last
call.  However, the playback/capture streams are handled as one ALSA
device, so the second /dev device will not be registered if the PCM
streams are added in two steps.

QUIRK_AUTODETECT caused the probe callback to be called once for each
interface, which triggered this problem.  Work around this by handling
this like the composite quirk, i.e., autodetecting all other interfaces
that might be used for PCM or MIDI.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
11 years agoALSA: usb-audio: remove superfluous Roland quirks
Clemens Ladisch [Thu, 7 Feb 2013 21:45:16 +0000 (22:45 +0100)]
ALSA: usb-audio: remove superfluous Roland quirks

Remove all quirks that are no longer needed now that the generic Roland
quirks can handle the vendor-specific descriptors correctly.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
11 years agoALSA: usb-audio: add MIDI port names for some Roland devices
Clemens Ladisch [Sat, 9 Feb 2013 09:05:20 +0000 (10:05 +0100)]
ALSA: usb-audio: add MIDI port names for some Roland devices

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
11 years agoALSA: usb-audio: add support for many Roland/Yamaha devices
Clemens Ladisch [Sun, 31 Mar 2013 21:43:12 +0000 (23:43 +0200)]
ALSA: usb-audio: add support for many Roland/Yamaha devices

Add quirks to detect the various vendor-specific descriptors used by
Roland and Yamaha in most of their recent USB audio and MIDI devices.

Together with the previous patch, this should add audio/MIDI support for
the following USB devices:
- Edirol motion dive .tokyo performance package
- Roland MC-808 Synthesizer
- Roland BK-7m Synthesizer
- Roland VIMA JM-5/8 Synthesizer
- Roland SP-555 Sequencer
- Roland V-Synth GT Synthesizer
- Roland Music Atelier AT-75/100/300/350C/500/800/900/900C Organ
- Edirol V-Mixer M-200i/300/380/400/480/R-1000
- BOSS GT-10B Effects Processor
- Roland Fantom G6/G7/G8 Keyboard
- Cakewalk Sonar V-Studio 20/100/700 Audio Interface
- Roland GW-8 Keyboard
- Roland AX-Synth Keyboard
- Roland JUNO-Di/STAGE/Gi Keyboard
- Roland VB-99 Effects Processor
- Cakewalk UM-2G MIDI Interface
- Roland A-500S Keyboard
- Roland SD-50 Synthesizer
- Roland OCTAPAD SPD-30 Controller
- Roland Lucina AX-09 Synthesizer
- BOSS BR-800 Digital Recorder
- Roland DUO/TRI-CAPTURE (EX) Audio Interface
- BOSS RC-300 Loop Station
- Roland JUPITER-50/80 Keyboard
- Roland R-26 Recorder
- Roland SPD-SX Controller
- BOSS JS-10 Audio Player
- Roland TD-11/15/30 Drum Module
- Roland A-49/88 Keyboard
- Roland INTEGRA-7 Synthesizer
- Roland R-88 Recorder

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
11 years agoALSA: usb-audio: detect implicit feedback on Roland devices
Clemens Ladisch [Sun, 3 Feb 2013 21:31:20 +0000 (22:31 +0100)]
ALSA: usb-audio: detect implicit feedback on Roland devices

All the Roland/Edirol/BOSS USB audio devices that need implicit feedback
show this unambiguously in their descriptors, so it might be a good idea
to let the driver detect this.

This should make playback work correctly (at least with Jack) with the
following devices:
- BOSS GT-100
- BOSS JS-8 Jam Station
- Edirol M-16DX
- Roland GAIA SH-01

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
11 years agoALSA: usb-audio: store protocol version in struct audioformat
Clemens Ladisch [Thu, 31 Jan 2013 20:39:17 +0000 (21:39 +0100)]
ALSA: usb-audio: store protocol version in struct audioformat

Instead of reading bInterfaceProtocol from the descriptor whenever it's
needed, store this value in the audioformat structure.  Besides
simplifying some code, this will allow us to correctly handle vendor-
specific devices where the descriptors are marked with other values.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
11 years agoALSA: pci: trivial: replace numeric with standard PM state macros
Yijing Wang [Thu, 27 Jun 2013 12:55:11 +0000 (20:55 +0800)]
ALSA: pci: trivial: replace numeric with standard PM state macros

Use standard PM state macros PCI_Dx instead of numeric 0/1/2..

Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoASoC: ac97: Support multi-platform AC'97
Mark Brown [Wed, 26 Jun 2013 11:45:59 +0000 (12:45 +0100)]
ASoC: ac97: Support multi-platform AC'97

Currently we can only have a single platform built in with AC'97 support
due to the use of a global variable to provide the bus operations. Fix
this by making that variable a pointer and having the bus drivers set the
operations prior to registering.

This is not a particularly good or nice approach but it avoids blocking
multiplatform and a real fix involves fixing the fairly deep problems
with AC'97 support - we should be converting it to a real bus.

Acked-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoMerge branch 'topic/wm9705' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Mark Brown [Thu, 27 Jun 2013 08:48:37 +0000 (09:48 +0100)]
Merge branch 'topic/wm9705' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-ac97

11 years agoMerge branch 'topic/stac9766' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni...
Mark Brown [Thu, 27 Jun 2013 08:47:04 +0000 (09:47 +0100)]
Merge branch 'topic/stac9766' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-ac97

11 years agoASoC: wm9705: Remove noisy print on boot
Mark Brown [Tue, 25 Jun 2013 16:19:56 +0000 (17:19 +0100)]
ASoC: wm9705: Remove noisy print on boot

There's no content in the announcement.

Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: txx9aclc_ac97: Convert to devm_ioremap_resource()
Mark Brown [Wed, 26 Jun 2013 11:40:47 +0000 (12:40 +0100)]
ASoC: txx9aclc_ac97: Convert to devm_ioremap_resource()

Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: tegra-ac97: Do common and clock init prior to component registration
Mark Brown [Wed, 26 Jun 2013 11:27:58 +0000 (12:27 +0100)]
ASoC: tegra-ac97: Do common and clock init prior to component registration

Otherwise we may instantiate and hence have something try to access the
device while it is still completing initialisation.

Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: tegra20-ac97: Convert to devm_ioremap_resource()
Mark Brown [Wed, 26 Jun 2013 11:18:39 +0000 (12:18 +0100)]
ASoC: tegra20-ac97: Convert to devm_ioremap_resource()

Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: tegra20-ac97: Convert to devm_clk_get()
Mark Brown [Wed, 26 Jun 2013 11:16:50 +0000 (12:16 +0100)]
ASoC: tegra20-ac97: Convert to devm_clk_get()

Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: nuc900-ac97: Convert to use devm_ APIs
Mark Brown [Wed, 26 Jun 2013 11:11:33 +0000 (12:11 +0100)]
ASoC: nuc900-ac97: Convert to use devm_ APIs

Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: ep93xx: Remove redundant dev_set_drvdata() calls
Mark Brown [Wed, 26 Jun 2013 10:53:45 +0000 (11:53 +0100)]
ASoC: ep93xx: Remove redundant dev_set_drvdata() calls

The driver core does this and it's never legal to rely on the value of
drvdata if not set in probe() anyway.

Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: bf5xx-ac97: Convert to devm_gpio_request_one()
Mark Brown [Wed, 26 Jun 2013 10:47:56 +0000 (11:47 +0100)]
ASoC: bf5xx-ac97: Convert to devm_gpio_request_one()

Also clean up the error reporting from failed requests while we're at it.

Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: ac97c: Use module_platform_driver()
Mark Brown [Wed, 26 Jun 2013 10:30:37 +0000 (11:30 +0100)]
ASoC: ac97c: Use module_platform_driver()

Acked-by: Manuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: psc-ac97: Convert to module_platform_driver()
Mark Brown [Wed, 26 Jun 2013 10:28:59 +0000 (11:28 +0100)]
ASoC: psc-ac97: Convert to module_platform_driver()

Acked-by: Manuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: psc-ac97: Use devm_ioremap_resource()
Mark Brown [Wed, 26 Jun 2013 10:09:55 +0000 (11:09 +0100)]
ASoC: psc-ac97: Use devm_ioremap_resource()

Acked-by: Manuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: samsung-ac97: Convert to devm_ioremap_resource()
Mark Brown [Wed, 26 Jun 2013 09:34:37 +0000 (10:34 +0100)]
ASoC: samsung-ac97: Convert to devm_ioremap_resource()

Reviewed-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: samsung-ac97: Use devm_clk_get()
Mark Brown [Wed, 26 Jun 2013 09:29:02 +0000 (10:29 +0100)]
ASoC: samsung-ac97: Use devm_clk_get()

Reviewed-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: mid-x86: Convert to use devm_* APIs
Wei Yongjun [Tue, 25 Jun 2013 02:16:56 +0000 (10:16 +0800)]
ASoC: mid-x86: Convert to use devm_* APIs

devm_* APIs are device managed and make code simpler.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoALSA: ak4xx-adda: info leak in ak4xxx_capture_source_info()
Dan Carpenter [Wed, 26 Jun 2013 07:52:20 +0000 (10:52 +0300)]
ALSA: ak4xx-adda: info leak in ak4xxx_capture_source_info()

"idx" is controled by the user and can be a negative offset into the
input_names[] array.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoASoC: wm9705: Remove noisy print on boot
Mark Brown [Tue, 25 Jun 2013 16:19:56 +0000 (17:19 +0100)]
ASoC: wm9705: Remove noisy print on boot

There's no content in the announcement.

Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: stac9766: Remove version number
Mark Brown [Tue, 25 Jun 2013 16:06:15 +0000 (17:06 +0100)]
ASoC: stac9766: Remove version number

There is no need to have versioning beyond that for the kernel, especially
when the version number never gets updated.

Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: adau1701: add support for pin muxing
Daniel Mack [Mon, 24 Jun 2013 14:31:32 +0000 (16:31 +0200)]
ASoC: adau1701: add support for pin muxing

The ADAU1701 has 12 pins that can be configured depending on the system
configuration. Allow settting the corresponding registers from DT.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: adau1701: switch to direct regmap API usage
Daniel Mack [Mon, 24 Jun 2013 14:31:31 +0000 (16:31 +0200)]
ASoC: adau1701: switch to direct regmap API usage

The hardware I/O has to be open-coded due to registers of unequal sizes.
Other than that, the transition is straight forward.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: adau1701: allow configuration of PLL mode pins
Daniel Mack [Mon, 24 Jun 2013 14:31:30 +0000 (16:31 +0200)]
ASoC: adau1701: allow configuration of PLL mode pins

The ADAU1701 has 2 hardware pins to configure the PLL mode in accordance
to the MCLK-to-LRCLK ratio. These pins have to be stable before the chip
is released from reset, and a full reset cycle, including a new firmware
download is needed whenever they change.

This patch adds GPIO properties to the DT bindings of the Codec, and
implements makes the set_sysclk memorize the configured sysclk.

Because the run-time parameters are unknown at probe time, the first
firmware download is postponed to the first hw_params call, when the
driver can determine the mclk/lrclk divider. Subsequent downloads
are only issued when the divider configuration changes.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: adau1701: move firmware download to adau1701_reset()
Daniel Mack [Mon, 24 Jun 2013 14:31:29 +0000 (16:31 +0200)]
ASoC: adau1701: move firmware download to adau1701_reset()

The chip needs a new download after each reset, so the code to do that
needs to live in adau1701_reset().

Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: tas5086: add support for pwm start mode config
Daniel Mack [Mon, 24 Jun 2013 14:25:32 +0000 (16:25 +0200)]
ASoC: tas5086: add support for pwm start mode config

The TAS5086 has two alternative modes to start its PWM channels, Mid-Z
and Low-Z. Which one to use depends on how the PWM power stages are
connected to the TAS5086.

This patch adds 6 optional boolean properties to the DT bindings of the
driver which allow the user to configure each individual channel to the
Mid-Z scheme, and leaves all the others to the default (Low-Z).

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: tas5086: add DAPM mux controls
Daniel Mack [Mon, 24 Jun 2013 14:25:31 +0000 (16:25 +0200)]
ASoC: tas5086: add DAPM mux controls

The TAS5086 has two muxes, one for connecting I2S inputs to internal
channels, and another one for selecting which internal channel should
be routed to which PWM output pin.

This patch adds DAPM widgets and routes for this driver.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: tas5086: add more register defines
Daniel Mack [Mon, 24 Jun 2013 14:25:30 +0000 (16:25 +0200)]
ASoC: tas5086: add more register defines

Add register definitions for input and output mux registers, and rewrite
the tas5086_accessible_reg() function.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: tas5086: open-code I2C transfer routines
Daniel Mack [Mon, 24 Jun 2013 14:25:29 +0000 (16:25 +0200)]
ASoC: tas5086: open-code I2C transfer routines

In order to support registers of unequal sizes, the I2C I/O has to be
open-coded.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoALSA: snd-firewire-lib: remove unused header inclusion
Takashi Sakamoto [Sun, 23 Jun 2013 02:50:24 +0000 (11:50 +0900)]
ALSA: snd-firewire-lib: remove unused header inclusion

spinlock is not used in amdtp.h.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoALSA: hda - Add missing alc_inv_dmic_sync() call in alc269_resume()
Takashi Iwai [Tue, 25 Jun 2013 07:28:40 +0000 (09:28 +0200)]
ALSA: hda - Add missing alc_inv_dmic_sync() call in alc269_resume()

As some of ALC269 quirks use the inverted dmic feature, we need to
call alc_inv_dmic_sync() in the resume callback like in alc_resume(),
too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoALSA: hda - Remove superfluous stac_resume()
Takashi Iwai [Tue, 25 Jun 2013 07:27:19 +0000 (09:27 +0200)]
ALSA: hda - Remove superfluous stac_resume()

The stac_resume() is exactly what the default resume code does, so
we don't have to define and use it doubly.  Let's cut it off.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoALSA: hda/hdmi - poll eld at resume time
Wang Xingchao [Mon, 24 Jun 2013 11:45:23 +0000 (07:45 -0400)]
ALSA: hda/hdmi - poll eld at resume time

Hdmi driver may not receive intrinsic event from gfx side when
it's in runtime suspend mode. There's no ELD info when exit from
runtime suspend. This patch avoid missing ELD info.

Signed-off-by: Wang Xingchao <xingchao.wang@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoALSA: hda - clean up code to reset hda link
Mengdong Lin [Tue, 25 Jun 2013 09:58:49 +0000 (05:58 -0400)]
ALSA: hda - clean up code to reset hda link

This patch is a cleanup to the previous patch "reset hda link during system/
runtime suspend".

In this patch
- azx_enter_link_reset() and azx_exit_link_reset() are defined for entering and
  exiting the link reset respectively. azx_link_reset() is no longer used and
  replaced by azx_enter_link_reset().
- azx_reset() reuses the above two new functions for a link reset cycle

Signed-off-by: Mengdong Lin <mengdong.lin@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoALSA: hda - Add In-driver connection info
Wang Xingchao [Tue, 25 Jun 2013 03:41:23 +0000 (23:41 -0400)]
ALSA: hda - Add In-driver connection info

Pin's connection list may change dynamically with hot-plug event
on Intel Haswell chip. Users would see connections be "0" in codec#.
when play audio on this pin, software driver choose converter from cache
connections. So add "In-driver connection" info to avoid confuse when
raw connections are different with cache connection.

Signed-off-by: Wang Xingchao <xingchao.wang@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoALSA: hda - Use auto_mute_via_amp=1 for VT1708
Takashi Iwai [Mon, 24 Jun 2013 14:18:10 +0000 (16:18 +0200)]
ALSA: hda - Use auto_mute_via_amp=1 for VT1708

We've got bug report wrt many machines with VT1708 (e.g. IBM POS
machines) showing the broken auto-mute behavior.  It turned out that
the problem is that the pin control values of the speaker and line-out
pins are completely ignored.  As a workaround, let's use the newly
introduced feature of the generic parser, to control the mute via amp
on pins.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoALSA: hda - Add auto_mute_via_amp flag to generic parser
Takashi Iwai [Mon, 24 Jun 2013 14:00:21 +0000 (16:00 +0200)]
ALSA: hda - Add auto_mute_via_amp flag to generic parser

Add a new flag, auto_mute_via_amp, to determine the behavior of the
headphone / line-out auto-mute.  When this flag is set, the generic
driver mutes the speaker and line outputs via the amp mute of each
pin, instead of changing the pin control values.

This is introduced for devices that don't work expectedly with the pin
control values; for example, some devices are known to keep enabling
the speaker outputs no matter which pin control values are set on the
speaker pins.

The driver doesn't check actually whether the pins have the output amp
caps, but assumes that the proper mixer (mute) controls are created on
all these pins.  If not the case, you can't use this flag for your
device.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoASoC: twl6040: Add digital mute support
Peter Ujfalusi [Mon, 24 Jun 2013 13:42:06 +0000 (15:42 +0200)]
ASoC: twl6040: Add digital mute support

To reduce pop noise during playback stream start and stop the codec needs
to have the digital_mute callback implemented.
The codec need to be muted before the CPU dai has been stopped (McPDM).
Stopping the McPDM will generate a pop on the codec since no signal on the
PDM bus means full negative amplitude.
By managing the mute/unmute state of the outputs we can decrease the amount
of pop noise when playback starts or stops.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: twl6040: Assign id for each DAI
Peter Ujfalusi [Mon, 24 Jun 2013 13:42:05 +0000 (15:42 +0200)]
ASoC: twl6040: Assign id for each DAI

Later we can identify the DAIs by this ID number.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agomfd: twl6040: Update register bit definitions
Peter Ujfalusi [Mon, 24 Jun 2013 13:42:04 +0000 (15:42 +0200)]
mfd: twl6040: Update register bit definitions

Add define for: HSDRV, HFDAC, HFPGA and HFDRV enable bits

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
CC: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoASoC: twl6040: Drop using devm_request_threaded_irq()
Peter Ujfalusi [Mon, 24 Jun 2013 13:42:03 +0000 (15:42 +0200)]
ASoC: twl6040: Drop using devm_request_threaded_irq()

We need to free the irq at twl6040_remove() which is called when the machine
driver has been removed (the card has been removed).
If we fail to do that, next time when the machine driver is loaded the
codec's probe will fail since the irq has been already requested.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
11 years agoALSA: vmaster: Add snd_ctl_sync_vmaster() helper function
Takashi Iwai [Mon, 24 Jun 2013 13:51:54 +0000 (15:51 +0200)]
ALSA: vmaster: Add snd_ctl_sync_vmaster() helper function

Introduce a new helper function, snd_ctl_sync_vmaster(), which updates
the slave put callbacks forcibly as well as calling the hook.  This
will be used in the upcoming patch in HD-audio codec driver for
toggling the mute in vmaster slaves.

Along with the new function, the old snd_ctl_sync_vmaster_hook() is
replaced as a macro calling with the argument hook_only=true.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoMerge tag 'asoc-v3.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Takashi Iwai [Mon, 24 Jun 2013 12:09:35 +0000 (14:09 +0200)]
Merge tag 'asoc-v3.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v3.10

A few small updates, one small core fix and several simple driver ones.
The wm8962 changes are a little large but are pretty important.

11 years agoALSA: hda - Remove unused variable
Wang Xingchao [Mon, 24 Jun 2013 13:10:18 +0000 (09:10 -0400)]
ALSA: hda - Remove unused variable

Signed-off-by: Wang Xingchao <xingchao.wang@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoALSA: hda - reset hda link during system/runtime suspend
Mengdong Lin [Mon, 24 Jun 2013 14:18:54 +0000 (10:18 -0400)]
ALSA: hda - reset hda link during system/runtime suspend

If all the codecs report ClkStopOK (OK to stop bus clock) after being put to
D3, this patch will reset the HDA link before the controller is put to D3.

So the link will be in reset during system or runtime suspend, the bus clock
stops and the codecs are in D3(ClkStop) state.

This may help to reduce power consumption by dozens of mW on some peripheral
hda codecs.

Signed-off-by: Mengdong Lin <mengdong.lin@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoAdd M2Tech hiFace USB-SPDIF driver
Antonio Ospite [Fri, 21 Jun 2013 22:14:46 +0000 (00:14 +0200)]
Add M2Tech hiFace USB-SPDIF driver

Add driver for M2Tech hiFace USB-SPDIF interface and compatible devices.

M2Tech hiFace and compatible devices offer a Hi-End S/PDIF Output
Interface, see http://www.m2tech.biz/hiface.html

The supported products are:

  * M2Tech Young
  * M2Tech hiFace
  * M2Tech North Star
  * M2Tech W4S Young
  * M2Tech Corrson
  * M2Tech AUDIA
  * M2Tech SL Audio
  * M2Tech Empirical
  * M2Tech Rockna
  * M2Tech Pathos
  * M2Tech Metronome
  * M2Tech CAD
  * M2Tech Audio Esclusive
  * M2Tech Rotel
  * M2Tech Eeaudio
  * The Chord Company CHORD
  * AVA Group A/S Vitus

Signed-off-by: Antonio Ospite <ao2@amarulasolutions.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoLinux 3.10-rc7 v3.10-rc7
Linus Torvalds [Sat, 22 Jun 2013 19:47:31 +0000 (09:47 -1000)]
Linux 3.10-rc7

11 years agoMerge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
Linus Torvalds [Sat, 22 Jun 2013 19:44:45 +0000 (09:44 -1000)]
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Arnd Bergmann:
 "These are two fixes that came in this week, one for a regression we
  introduced in 3.10 in the GIC interrupt code, and the other one fixes
  a typo in newly introduced code"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  irqchip: gic: call gic_cpu_init() as well in CPU_STARTING_FROZEN case
  ARM: dts: Correct the base address of pinctrl_3 on Exynos5250

11 years agoMerge tag 'driver-core-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Sat, 22 Jun 2013 19:02:44 +0000 (09:02 -1000)]
Merge tag 'driver-core-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core fix from Greg Kroah-Hartman:
 "Here's a single patch for the firmware core that resolves a reported
  oops in the firmware core that people have been hitting."

* tag 'driver-core-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  firmware loader: fix use-after-free by double abort

11 years agoMerge tag 'usb-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Linus Torvalds [Sat, 22 Jun 2013 19:01:47 +0000 (09:01 -1000)]
Merge tag 'usb-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB fixes from Greg Kroah-Hartman:
 "Here are two USB patches for 3.10.

  One updates the Kconfig wording for CONFIG_USB_PHY to make it,
  hopefully, more obvious what this option is (I know you complained
  about this when it hit the tree.) The other is a new device id for a
  driver"

* tag 'usb-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: serial: ti_usb_3410_5052: new device id for Abbot strip port cable
  usb: phy: Improve Kconfig help for CONFIG_USB_PHY

11 years agoMerge tag 'tty-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Linus Torvalds [Sat, 22 Jun 2013 19:00:28 +0000 (09:00 -1000)]
Merge tag 'tty-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pul tty fixes from Greg Kroah-Hartman:
 "Here are two tty core fixes that resolve some regressions that have
  been reported recently.  Both tiny fixes, but needed"

* tag 'tty-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  tty: Fix transient pty write() EIO
  tty/vt: Return EBUSY if deallocating VT1 and it is busy

11 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
Linus Torvalds [Sat, 22 Jun 2013 18:54:06 +0000 (08:54 -1000)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

Pull SCSI target fixes from Nicholas Bellinger:
 "Included is the recent tcm_qla2xxx residual underrun length fix from
  Roland, along with Joern's iscsi-target patch for session_lock
  breakage within iscsit_stop_time2retain_timer() code.  Both are CC'ed
  to stable.

  The remaining two are specific to recent iscsi-target + iser
  conversion changes.  One drops some left-over debug noise, and Andy's
  patch fixes configfs attribute handling during an explicit network
  portal feature bit disable when iser-target is unsupported."

* git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  iscsi-target: Remove left over v3.10-rc debug printks
  target/iscsi: Fix op=disable + error handling cases in np_store_iser
  tcm_qla2xxx: Fix residual for underrun commands that fail
  target/iscsi: don't corrupt bh_count in iscsit_stop_time2retain_timer()