diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-02-27 10:08:30 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-27 10:08:30 +0100 |
| commit | 49d6b2ee0f6ee3570dc976efb551ad45bf43baa8 (patch) | |
| tree | 5f24dc2228a9fb7e2a17719b59661ca7a0a9550c | |
| parent | ddc875df6db93fbaf3eecc11c04356945add17de (diff) | |
| download | alsa-driver-build-unstable-49d6b2ee0f6ee3570dc976efb551ad45bf43baa8.tar.gz | |
Refresh hda_beep.patch
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | alsa/pci/hda/hda_beep.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/alsa/pci/hda/hda_beep.patch b/alsa/pci/hda/hda_beep.patch index c70390cf4..b316013eb 100644 --- a/alsa/pci/hda/hda_beep.patch +++ b/alsa/pci/hda/hda_beep.patch @@ -1,5 +1,5 @@ ---- ../../alsa-kernel/pci/hda/hda_beep.c 2014-02-27 09:34:52.311696824 +0100 -+++ hda_beep.c 2014-02-27 09:39:39.726178305 +0100 +--- ../../alsa-kernel/pci/hda/hda_beep.c 2014-02-27 09:57:51.057241933 +0100 ++++ hda_beep.c 2014-02-27 10:03:34.413623928 +0100 @@ -1,3 +1,5 @@ +#define __NO_VERSION__ +#include "adriver.h" @@ -55,11 +55,11 @@ input_dev->sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE); input_dev->event = snd_hda_beep_event; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) - input_dev->dev.parent = codec->bus->card->dev; + input_dev->dev.parent = &codec->dev; input_set_drvdata(input_dev, beep); +#else +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 15) -+ input_dev->cdev.dev = codec->bus->card>dev; ++ input_dev->cdev.dev = &codec->dev; +#endif + input_dev->private = beep; +#endif /* 2.6.22 */ @@ -68,7 +68,7 @@ err = input_register_device(input_dev); if (err < 0) { input_free_device(input_dev); - printk(KERN_INFO "hda_beep: unable to register input device\n"); + codec_err(codec, "hda_beep: unable to register input device\n"); return err; } +#else |