diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-05-03 05:39:36 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-05-03 05:39:36 -0400 |
commit | f91eeeb59583087722dc0699ac8aaf4b6af4a77f (patch) | |
tree | 7ea886877cfdfbc8cc6f50aa1f379de62a9092f1 /fs | |
parent | 4ca231b2e6ed171107c5b21f9e92d1965fd6fd9e (diff) | |
parent | 9631c02e240236ec206394fb52380647d0e70e4f (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.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 | ||
1031 | out: | 1031 | out: |
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 | ||