Merge tag 'v3.10.69' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / sound / ak4114.h

diff --git a/include/sound/ak4114.h b/include/sound/ak4114.h
index 3ce69fd925233188eb59756d2ba0b9be203d39aa..69441161009c50068245c5f2d8139d0ec4fe30e9 100644 (file)
--- a/include/sound/ak4114.h
+++ b/include/sound/ak4114.h
@@ -168,7 +168,7 @@ struct ak4114 {
        ak4114_write_t * write;
        ak4114_read_t * read;
        void * private_data;
-       unsigned int init: 1;
+       atomic_t wq_processing;
        spinlock_t lock;
        unsigned char regmap[7];
        unsigned char txcsb[5];