diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-09-30 10:49:45 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-09-30 10:49:45 +0200 |
| commit | 6ae405996ca4a656fbc939ed4f0a4c5b2f8925a7 (patch) | |
| tree | ef7007442ea510ecd36f225957e251a8e6bd336e /fs/fscache | |
| parent | ALSA: hda - Enable internal mic on a Thinkpad machine with ALC283 (diff) | |
| parent | Merge remote-tracking branch 'asoc/fix/max98095' into asoc-linus (diff) | |
| download | linux-6ae405996ca4a656fbc939ed4f0a4c5b2f8925a7.tar.xz linux-6ae405996ca4a656fbc939ed4f0a4c5b2f8925a7.zip | |
Merge tag 'asoc-v3.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.12
Nothing too exciting here, all driver specific except for the fix from
Liam for DPCM systems which have both front and back end DAIs which is
not yet used by anything in mainline.
Diffstat (limited to 'fs/fscache')
| -rw-r--r-- | fs/fscache/cookie.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c index 318e8433527c..b2a86e324aac 100644 --- a/fs/fscache/cookie.c +++ b/fs/fscache/cookie.c @@ -586,7 +586,8 @@ int __fscache_check_consistency(struct fscache_cookie *cookie) fscache_operation_init(op, NULL, NULL); op->flags = FSCACHE_OP_MYTHREAD | - (1 << FSCACHE_OP_WAITING); + (1 << FSCACHE_OP_WAITING) | + (1 << FSCACHE_OP_UNUSE_COOKIE); spin_lock(&cookie->lock); |