From d0354f43c88f589a89302ab905d5d0af9a9c7e9c Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Thu, 20 Dec 2012 13:09:59 +0000 Subject: [PATCH] --- yaml --- r: 353465 b: refs/heads/master c: a2ce64750e07d74c51f02c5652edfc1aa2d8e894 h: refs/heads/master i: 353463: 1e285c566af384eddfa34795ac2470753ad928ea v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8962.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 801e3a39ee6d..a7d8cad94d44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ce568329e4fcf9e9050bff878f8157ca43bc882 +refs/heads/master: a2ce64750e07d74c51f02c5652edfc1aa2d8e894 diff --git a/trunk/sound/soc/codecs/wm8962.c b/trunk/sound/soc/codecs/wm8962.c index 705d0a0e9137..0b3680315df8 100644 --- a/trunk/sound/soc/codecs/wm8962.c +++ b/trunk/sound/soc/codecs/wm8962.c @@ -3189,7 +3189,7 @@ static void wm8962_init_beep(struct snd_soc_codec *codec) struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec); int ret; - wm8962->beep = input_allocate_device(); + wm8962->beep = devm_input_allocate_device(codec->dev); if (!wm8962->beep) { dev_err(codec->dev, "Failed to allocate beep device\n"); return; @@ -3210,7 +3210,6 @@ static void wm8962_init_beep(struct snd_soc_codec *codec) ret = input_register_device(wm8962->beep); if (ret != 0) { - input_free_device(wm8962->beep); wm8962->beep = NULL; dev_err(codec->dev, "Failed to register beep device\n"); } @@ -3227,7 +3226,6 @@ static void wm8962_free_beep(struct snd_soc_codec *codec) struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec); device_remove_file(codec->dev, &dev_attr_beep); - input_unregister_device(wm8962->beep); cancel_work_sync(&wm8962->beep_work); wm8962->beep = NULL;