diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-10 09:19:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-10 09:19:44 -0700 |
| commit | e7990d45bb88c2f0565b5ee4c32eefe81653faff (patch) | |
| tree | 852ab6988b7226083fefa0e0e851dbff0e7ec7f2 /sound/oss/ad1848.c | |
| parent | 190a3998be3ede25d6145e187d6d321f504d28fb (diff) | |
| parent | a5065eb6da55b226661456e6a7435f605df98111 (diff) | |
| download | linux-e7990d45bb88c2f0565b5ee4c32eefe81653faff.tar.bz2 | |
Merge tag 'sound-fix-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Here is a bunch of small fixes that have been collected since the
previous pull request. In addition to various misc fixes, the
following are included:
- HD-audio quirks for Dell, HP, Chromebook, and ALC28x codecs
- HD-audio AMD HDMI regression fix
- Continued PM support/fixes for ice1712 driver
- Multiplatform fixes for ASoC samsung drivers
- Addition of device id tables to a few ASoC drivers
- Bit clock polarity config and error flag fixes in ASoC fsl_sai"
* tag 'sound-fix-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (32 commits)
ALSA: usb-audio: Suppress repetitive debug messages from retire_playback_urb()
ALSA: hda - Make full_reset boolean
ALSA: hda - add headset mic detect quirk for a Dell laptop
sound: dmasound: use module_platform_driver_probe()
ALSA: au1x00: use module_platform_driver()
ALSA: hda - Use runtime helper to check active state.
ALSA: ice1712: Fix boundary checks in PCM pointer ops
ASoC: davinci-mcasp: Fix bit clock polarity settings
ASoC: samsung: Fix build on multiplatform
ASoC: fsl_sai: Fix Bit Clock Polarity configurations
ALSA: hda - Do not assign streams in reverse order
ALSA: hda/realtek - Add eapd shutup to ALC283
ALSA: hda/realtek - Change model name alias for ChromeOS
ASoC: da732x: Print correct major id
ALSA: hda/realtek - Improve HP depop when system change power state on Chromebook
ASoC: cs42l52: Fix mask for REVID
sound/oss: Remove uncompilable DBG macro use
ALSA: ice1712: Save/restore routing and rate registers
ALSA: ice1712: restore AK4xxx volumes on resume
ASoC: alc56(23|32): fix undefined return value of probing code
...
Diffstat (limited to 'sound/oss/ad1848.c')
| -rw-r--r-- | sound/oss/ad1848.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c index 4918b7145b73..ec1ee07df59d 100644 --- a/sound/oss/ad1848.c +++ b/sound/oss/ad1848.c @@ -50,8 +50,6 @@ #include <linux/pnp.h> #include <linux/spinlock.h> -#define DEB(x) -#define DEB1(x) #include "sound_config.h" #include "ad1848.h" @@ -1016,8 +1014,6 @@ static void ad1848_close(int dev) ad1848_info *devc = (ad1848_info *) audio_devs[dev]->devc; ad1848_port_info *portc = (ad1848_port_info *) audio_devs[dev]->portc; - DEB(printk("ad1848_close(void)\n")); - devc->intr_active = 0; ad1848_halt(dev); |