aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-02-27 03:33:00 -0500
committerTakashi Iwai <tiwai@suse.de>2014-02-27 03:33:00 -0500
commitf2606a807935fab0d5a2806673dcc4ce4f1f40e4 (patch)
treef014325c4f3756d006196876c98a416a3375593a /sound/pci
parent4e76a8833fac8dc1735aa5be7d1b3c92c65e209e (diff)
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')
-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)
166 input_dev->evbit[0] = BIT_MASK(EV_SND); 166 input_dev->evbit[0] = BIT_MASK(EV_SND);
167 input_dev->sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE); 167 input_dev->sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE);
168 input_dev->event = snd_hda_beep_event; 168 input_dev->event = snd_hda_beep_event;
169 input_dev->dev.parent = codec->bus->card->dev; 169 input_dev->dev.parent = &codec->dev;
170 input_set_drvdata(input_dev, beep); 170 input_set_drvdata(input_dev, beep);
171 171
172 err = input_register_device(input_dev); 172 err = input_register_device(input_dev);