aboutsummaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorJan Engelmohr <jan.engelmohr@mailbox.tu-dresden.de>2016-07-26 17:56:43 +0200
committerMoyster <oysterized@gmail.com>2016-08-26 15:59:18 +0200
commitc185b77b187a5b9af6fcfaaa5486c52cd902b1d1 (patch)
treecde3b4fcd1a5afe0a64950345c04e3f0c8feb469 /include/sound
parent0b5a5b0a7acdc85c34d8319272d8ea54a92c5a5d (diff)
3.10.68 -> 3.10.69
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/ak4113.h2
-rw-r--r--include/sound/ak4114.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/ak4113.h b/include/sound/ak4113.h
index 2609048c1..3a34f6edc 100644
--- a/include/sound/ak4113.h
+++ b/include/sound/ak4113.h
@@ -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];
diff --git a/include/sound/ak4114.h b/include/sound/ak4114.h
index 3ce69fd92..694411610 100644
--- 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];