Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

Browse source

Pull dmaengine fixes from Vinod Koul:
 "We have two small fixes:

   - pl330 termination hang fix by Krzysztof

   - hsu memory leak fix by Peter"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: hsu: Fix memory leak when stopping a running transfer
  dmaengine: pl330: Fix hang on dmaengine_terminate_all on certain boards

...

This commit is contained in:

Linus Torvalds 2015-06-04 10:19:34 -07:00

parent 8a7deb362b 429770823d

commit ff25ea8f4e

2 changed files with 7 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

drivers/dma/hsu/hsu.c

View file

3

drivers/dma/pl330.c

View file