diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-21 14:38:51 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-21 14:38:51 -0700 |
commit | ac185bdc02c216040f3b83f654d864bd8a29cedc (patch) | |
tree | 7cc59ba443f3fc52d329437949436b5b37f1d7ea /arch/arm/common/dmabounce.c | |
parent | ae298c98e5ab5bab3b39ffe0c2aebfeb4b1e68a2 (diff) | |
parent | ba9b5d76372dc290b6ca04dad93927a22c2ac49a (diff) | |
download | op-kernel-dev-ac185bdc02c216040f3b83f654d864bd8a29cedc.zip op-kernel-dev-ac185bdc02c216040f3b83f654d864bd8a29cedc.tar.gz |
Merge gregkh@master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/common/dmabounce.c')
-rw-r--r-- | arch/arm/common/dmabounce.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c index 5b7c263..028bdc9 100644 --- a/arch/arm/common/dmabounce.c +++ b/arch/arm/common/dmabounce.c @@ -179,17 +179,19 @@ alloc_safe_buffer(struct dmabounce_device_info *device_info, void *ptr, static inline struct safe_buffer * find_safe_buffer(struct dmabounce_device_info *device_info, dma_addr_t safe_dma_addr) { - struct safe_buffer *b = NULL; + struct safe_buffer *b, *rb = NULL; unsigned long flags; read_lock_irqsave(&device_info->lock, flags); list_for_each_entry(b, &device_info->safe_buffers, node) - if (b->safe_dma_addr == safe_dma_addr) + if (b->safe_dma_addr == safe_dma_addr) { + rb = b; break; + } read_unlock_irqrestore(&device_info->lock, flags); - return b; + return rb; } static inline void |