Merge branch 'fix/asoc' into for-linus

2 files changed, 20 insertions, 19 deletions

diff --git a/include/linux/cred.h b/include/linux/cred.h
index 48e82af1159b..98f46efbe2d2 100644
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -265,10 +265,11 @@ static inline void put_cred(const struct cred *_cred)
 /**
  * current_cred - Access the current task's subjective credentials
  *
- * Access the subjective credentials of the current task.
+ * Access the subjective credentials of the current task.  RCU-safe,
+ * since nobody else can modify it.
  */
 #define current_cred() \
-        (current->cred)
+        (*(__force struct cred **)&current->cred)
 
 /**
  * __task_cred - Access a task's objective credentials
@@ -307,7 +308,7 @@ static inline void put_cred(const struct cred *_cred)
 ({                                                      \
         struct user_struct *__u;                        \
         struct cred *__cred;                            \
-        __cred = (struct cred *) current_cred();        \
+        __cred = current_cred();                        \
         __u = get_uid(__cred->user);                    \
         __u;                                            \
 })
@@ -322,7 +323,7 @@ static inline void put_cred(const struct cred *_cred)
 ({                                                      \
         struct group_info *__groups;                    \
         struct cred *__cred;                            \
-        __cred = (struct cred *) current_cred();        \
+        __cred = current_cred();                        \
         __groups = get_group_info(__cred->group_info);  \
         __groups;                                       \
 })
@@ -341,7 +342,7 @@ static inline void put_cred(const struct cred *_cred)
 
 #define current_cred_xxx(xxx)                   \
 ({                                              \
-        current->cred->xxx;                     \
+        current_cred()->xxx;                    \
 })
 
 #define current_uid()           (current_cred_xxx(uid))
diff --git a/include/sound/wm8915.h b/include/sound/wm8996.h
index 5817d762f6f3..ea4d88f43975 100644
--- a/include/sound/wm8915.h
+++ b/include/sound/wm8996.h
@@ -1,5 +1,5 @@
 /*
- * linux/sound/wm8915.h -- Platform data for WM8915
+ * linux/sound/wm8996.h -- Platform data for WM8996
  *
  * Copyright 2011 Wolfson Microelectronics. PLC.
  *
@@ -8,14 +8,14 @@
  * published by the Free Software Foundation.
  */
 
-#ifndef __LINUX_SND_WM8903_H
-#define __LINUX_SND_WM8903_H
+#ifndef __LINUX_SND_WM8996_H
+#define __LINUX_SND_WM8996_H
 
-enum wm8915_inmode {
-        WM8915_DIFFERRENTIAL_1 = 0,   /* IN1xP - IN1xN */
-        WM8915_INVERTING = 1,         /* IN1xN */
-        WM8915_NON_INVERTING = 2,     /* IN1xP */
-        WM8915_DIFFERENTIAL_2 = 3,    /* IN2xP - IN2xP */
+enum wm8996_inmode {
+        WM8996_DIFFERRENTIAL_1 = 0,   /* IN1xP - IN1xN */
+        WM8996_INVERTING = 1,         /* IN1xN */
+        WM8996_NON_INVERTING = 2,     /* IN1xP */
+        WM8996_DIFFERENTIAL_2 = 3,    /* IN2xP - IN2xP */
 };
 
 /**
@@ -25,23 +25,23 @@ enum wm8915_inmode {
  * Configurations are expected to be generated using the ReTune Mobile
  * control panel in WISCE - see http://www.wolfsonmicro.com/wisce/
  */
-struct wm8915_retune_mobile_config {
+struct wm8996_retune_mobile_config {
         const char *name;
         int rate;
         u16 regs[20];
 };
 
-#define WM8915_SET_DEFAULT 0x10000
+#define WM8996_SET_DEFAULT 0x10000
 
-struct wm8915_pdata {
+struct wm8996_pdata {
         int irq_flags;  /** Set IRQ trigger flags; default active low */
 
         int ldo_ena;  /** GPIO for LDO1; -1 for none */
 
         int micdet_def;  /** Default MICDET_SRC/HP1FB_SRC/MICD_BIAS */
 
-        enum wm8915_inmode inl_mode;
-        enum wm8915_inmode inr_mode;
+        enum wm8996_inmode inl_mode;
+        enum wm8996_inmode inr_mode;
 
         u32 spkmute_seq;  /** Value for register 0x802 */
 
@@ -49,7 +49,7 @@ struct wm8915_pdata {
         u32 gpio_default[5];
 
         int num_retune_mobile_cfgs;
-        struct wm8915_retune_mobile_config *retune_mobile_cfgs;
+        struct wm8996_retune_mobile_config *retune_mobile_cfgs;
 };
 
 #endif