aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-05-03 05:39:36 -0400
committerTakashi Iwai <tiwai@suse.de>2013-05-03 05:39:36 -0400
commitf91eeeb59583087722dc0699ac8aaf4b6af4a77f (patch)
tree7ea886877cfdfbc8cc6f50aa1f379de62a9092f1 /fs
parent4ca231b2e6ed171107c5b21f9e92d1965fd6fd9e (diff)
parent9631c02e240236ec206394fb52380647d0e70e4f (diff)
Merge tag 'asoc-v3.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.10 A few more bug fixes, the DAPM clock fix is actually a driver specific one since currently there's only one user of the clock support due to the problems relying on the clock API.
Diffstat (limited to 'fs')
-rw-r--r--fs/aio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/aio.c b/fs/aio.c
index 3f941f2a3059..1dc8786f4588 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1029,9 +1029,9 @@ static int aio_read_evt(struct kioctx *ioctx, struct io_event *ent)
1029 spin_unlock(&info->ring_lock); 1029 spin_unlock(&info->ring_lock);
1030 1030
1031out: 1031out:
1032 kunmap_atomic(ring);
1033 dprintk("leaving aio_read_evt: %d h%lu t%lu\n", ret, 1032 dprintk("leaving aio_read_evt: %d h%lu t%lu\n", ret,
1034 (unsigned long)ring->head, (unsigned long)ring->tail); 1033 (unsigned long)ring->head, (unsigned long)ring->tail);
1034 kunmap_atomic(ring);
1035 return ret; 1035 return ret;
1036} 1036}
1037 1037