ALSA: timer - Fix Oops at closing slave timer

[linux-2.6.git] / sound / core / vmaster.c

diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c
index 3b9b550109cb9fe4e59b60db5ee436546029867c..a39d3d8c2f9c9edb53025953c102f5d5cdb89aa3 100644 (file)
--- a/sound/core/vmaster.c
+++ b/sound/core/vmaster.c
@@ -18,7 +18,7 @@
  * a subset of information returned via ctl info callback
  */
 struct link_ctl_info {
-       int type;               /* value type */
+       snd_ctl_elem_type_t type; /* value type */
        int count;              /* item count */
        int min_val, max_val;   /* min, max values */
 };
@@ -233,7 +233,7 @@ static void slave_free(struct snd_kcontrol *kcontrol)
  * Add a slave control to the group with the given master control
  *
  * All slaves must be the same type (returning the same information
- * via info callback).  The fucntion doesn't check it, so it's your
+ * via info callback).  The function doesn't check it, so it's your
  * responsibility.
  *
  * Also, some additional limitations: