summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-05-07 17:10:21 +0100
committerTakashi Iwai <tiwai@suse.de>2012-05-07 18:11:37 +0200
commita2e888f0d7cf6f2011740acb1f310bcc959c2842 (patch)
treef24bbd033bbe832bfa2a050703e389fb0a34dd11 /sound
parent76bc7a0d0a2a833d09fbf9d4e19a7985ef6e276b (diff)
downloadlinux-a2e888f0d7cf6f2011740acb1f310bcc959c2842.tar.gz
linux-a2e888f0d7cf6f2011740acb1f310bcc959c2842.tar.bz2
linux-a2e888f0d7cf6f2011740acb1f310bcc959c2842.zip
ALSA: jack: Update documention to reflect other userspace interfaces
Since this is a generic API which should support any userspace interface for reporting jacks update the documentation a little to make that a bit clearer. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/core/jack.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/core/jack.c b/sound/core/jack.c
index 471e1e3b0a99..a06b1651fcba 100644
--- a/sound/core/jack.c
+++ b/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