Merge tag 'v3.10.69' into update

This is the 3.10.69 stable release
This commit is contained in:
Stricted
2018-03-21 22:39:46 +01:00
24 changed files with 221 additions and 92 deletions
+1 -1
View File
@@ -286,7 +286,7 @@ struct ak4113 {
ak4113_write_t *write;
ak4113_read_t *read;
void *private_data;
unsigned int init:1;
atomic_t wq_processing;
spinlock_t lock;
unsigned char regmap[AK4113_WRITABLE_REGS];
struct snd_kcontrol *kctls[AK4113_CONTROLS];
+1 -1
View File
@@ -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];