diff options
| author | James Morris <jmorris@namei.org> | 2009-03-26 22:28:11 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-26 22:28:11 +0100 |
| commit | 1987f17d2266e882862528841429b5bf67bc8fe5 (patch) | |
| tree | 5c3fbee88018ab7259a18c10e6320e575d0ed679 /sound/pci/hda/hda_beep.c | |
| parent | smack: convert smack to standard linux lists (diff) | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-1987f17d2266e882862528841429b5bf67bc8fe5.tar.xz linux-1987f17d2266e882862528841429b5bf67bc8fe5.zip | |
Merge branch 'master' into next
Diffstat (limited to 'sound/pci/hda/hda_beep.c')
| -rw-r--r-- | sound/pci/hda/hda_beep.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c index 960fd7970384..4de5bacd3929 100644 --- a/sound/pci/hda/hda_beep.c +++ b/sound/pci/hda/hda_beep.c @@ -138,6 +138,7 @@ void snd_hda_detach_beep_device(struct hda_codec *codec) input_unregister_device(beep->dev); kfree(beep); + codec->beep = NULL; } } EXPORT_SYMBOL_HDA(snd_hda_detach_beep_device); |