Commit 1b5e2a7e23439c13f73cacab1cf227f30cb9ae9f
Exists in
master
and in
20 other branches
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: iop-adma: fixup some kzalloc/memset confusions fsldma: update the fsldma driver MAINTAINERS info
Showing 2 changed files Side-by-side Diff
MAINTAINERS
| ... | ... | @@ -1646,8 +1646,10 @@ |
| 1646 | 1646 | S: Maintained |
| 1647 | 1647 | |
| 1648 | 1648 | FREESCALE DMA DRIVER |
| 1649 | -P; Zhang Wei | |
| 1650 | -M: wei.zhang@freescale.com | |
| 1649 | +P: Li Yang | |
| 1650 | +M: leoli@freescale.com | |
| 1651 | +P: Zhang Wei | |
| 1652 | +M: zw@zh-kernel.org | |
| 1651 | 1653 | L: linuxppc-embedded@ozlabs.org |
| 1652 | 1654 | L: linux-kernel@vger.kernel.org |
| 1653 | 1655 | S: Maintained |
drivers/dma/iop-adma.c
| ... | ... | @@ -821,10 +821,10 @@ |
| 821 | 821 | |
| 822 | 822 | dev_dbg(device->common.dev, "%s\n", __func__); |
| 823 | 823 | |
| 824 | - src = kzalloc(sizeof(u8) * IOP_ADMA_TEST_SIZE, GFP_KERNEL); | |
| 824 | + src = kmalloc(IOP_ADMA_TEST_SIZE, GFP_KERNEL); | |
| 825 | 825 | if (!src) |
| 826 | 826 | return -ENOMEM; |
| 827 | - dest = kzalloc(sizeof(u8) * IOP_ADMA_TEST_SIZE, GFP_KERNEL); | |
| 827 | + dest = kzalloc(IOP_ADMA_TEST_SIZE, GFP_KERNEL); | |
| 828 | 828 | if (!dest) { |
| 829 | 829 | kfree(src); |
| 830 | 830 | return -ENOMEM; |
| ... | ... | @@ -833,8 +833,6 @@ |
| 833 | 833 | /* Fill in src buffer */ |
| 834 | 834 | for (i = 0; i < IOP_ADMA_TEST_SIZE; i++) |
| 835 | 835 | ((u8 *) src)[i] = (u8)i; |
| 836 | - | |
| 837 | - memset(dest, 0, IOP_ADMA_TEST_SIZE); | |
| 838 | 836 | |
| 839 | 837 | /* Start copy, using first DMA channel */ |
| 840 | 838 | dma_chan = container_of(device->common.channels.next, |