1 files changed, 26 insertions, 10 deletions

diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c
index 0589b39cda6e..8c6c50afc0b7 100644
--- a/sound/pci/hda/hda_beep.c
+++ b/sound/pci/hda/hda_beep.c
@@ -20,7 +20,6 @@
  */
 
 #include <linux/input.h>
-#include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
 #include <linux/export.h>
@@ -140,7 +139,10 @@ static void turn_off_beep(struct hda_beep *beep)
 
 static void snd_hda_do_detach(struct hda_beep *beep)
 {
-        input_unregister_device(beep->dev);
+        if (beep->registered)
+                input_unregister_device(beep->dev);
+        else
+                input_free_device(beep->dev);
         beep->dev = NULL;
         turn_off_beep(beep);
 }
@@ -149,7 +151,6 @@ static int snd_hda_do_attach(struct hda_beep *beep)
 {
         struct input_dev *input_dev;
         struct hda_codec *codec = beep->codec;
-        int err;
 
         input_dev = input_allocate_device();
         if (!input_dev)
@@ -167,15 +168,9 @@ 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->pci->dev;
+        input_dev->dev.parent = &codec->dev;
         input_set_drvdata(input_dev, beep);
 
-        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");
-                return err;
-        }
         beep->dev = input_dev;
         return 0;
 }
@@ -245,6 +240,27 @@ void snd_hda_detach_beep_device(struct hda_codec *codec)
 }
 EXPORT_SYMBOL_GPL(snd_hda_detach_beep_device);
 
+int snd_hda_register_beep_device(struct hda_codec *codec)
+{
+        struct hda_beep *beep = codec->beep;
+        int err;
+
+        if (!beep || !beep->dev)
+                return 0;
+
+        err = input_register_device(beep->dev);
+        if (err < 0) {
+                codec_err(codec, "hda_beep: unable to register input device\n");
+                input_free_device(beep->dev);
+                codec->beep = NULL;
+                kfree(beep);
+                return err;
+        }
+        beep->registered = true;
+        return 0;
+}
+EXPORT_SYMBOL_GPL(snd_hda_register_beep_device);
+
 static bool ctl_has_mute(struct snd_kcontrol *kcontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);