summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_beep.c
diff options
context:
space:
mode:
authorTakashi Iwai2014-02-27 09:33:00 +0100
committerTakashi Iwai2014-02-27 09:33:00 +0100
commitf2606a807935fab0d5a2806673dcc4ce4f1f40e4 (patch)
treef014325c4f3756d006196876c98a416a3375593a /sound/pci/hda/hda_beep.c
parentALSA: hda - Replace with standard printk (diff)
downloadkernel-qcow2-linux-f2606a807935fab0d5a2806673dcc4ce4f1f40e4.tar.gz
kernel-qcow2-linux-f2606a807935fab0d5a2806673dcc4ce4f1f40e4.tar.xz
kernel-qcow2-linux-f2606a807935fab0d5a2806673dcc4ce4f1f40e4.zip
ALSA: hda - Make codec object as a parent for input beep devices
Instead of the controller, the new codec object is assigned as a parent for the hd-audio beep input devices, just like already done for PCM and hwdep. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_beep.c')
-rw-r--r--sound/pci/hda/hda_beep.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c
index d403981346d0..88bb08486f77 100644
--- a/sound/pci/hda/hda_beep.c
+++ b/sound/pci/hda/hda_beep.c
@@ -166,7 +166,7 @@ static int snd_hda_do_attach(struct hda_beep *beep)
input_dev->evbit[0] = BIT_MASK(EV_SND);
input_dev->sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE);
input_dev->event = snd_hda_beep_event;
- input_dev->dev.parent = codec->bus->card->dev;
+ input_dev->dev.parent = &codec->dev;
input_set_drvdata(input_dev, beep);
err = input_register_device(input_dev);