From 233b87d7b986cd7c32048a17d38ff38f6702b445 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 7 May 2012 17:10:21 +0100 Subject: [PATCH] --- yaml --- r: 305792 b: refs/heads/master c: a2e888f0d7cf6f2011740acb1f310bcc959c2842 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/core/jack.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 81fb53d5a130..0910ba024726 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76bc7a0d0a2a833d09fbf9d4e19a7985ef6e276b +refs/heads/master: a2e888f0d7cf6f2011740acb1f310bcc959c2842 diff --git a/trunk/sound/core/jack.c b/trunk/sound/core/jack.c index 471e1e3b0a99..a06b1651fcba 100644 --- a/trunk/sound/core/jack.c +++ b/trunk/sound/core/jack.c @@ -155,7 +155,7 @@ EXPORT_SYMBOL(snd_jack_new); * @jack: The jack to configure * @parent: The device to set as parent for the jack. * - * Set the parent for the jack input device in the device tree. This + * Set the parent for the jack devices in the device tree. This * function is only valid prior to registration of the jack. If no * parent is configured then the parent device will be the sound card. */ @@ -179,6 +179,9 @@ EXPORT_SYMBOL(snd_jack_set_parent); * mapping is provided but keys are enabled in the jack type then * BTN_n numeric buttons will be reported. * + * If jacks are not reporting via the input API this call will have no + * effect. + * * Note that this is intended to be use by simple devices with small * numbers of keys that can be reported. It is also possible to * access the input device directly - devices with complex input