diff options
-rw-r--r-- | MAINTAINERS | 6 | ||||
-rw-r--r-- | drivers/dma/iop-adma.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 461c2790e29e..b42dcfcbee44 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1646,8 +1646,10 @@ W: http://linux-fbdev.sourceforge.net/ | |||
1646 | S: Maintained | 1646 | S: Maintained |
1647 | 1647 | ||
1648 | FREESCALE DMA DRIVER | 1648 | FREESCALE DMA DRIVER |
1649 | P; Zhang Wei | 1649 | P: Li Yang |
1650 | M: wei.zhang@freescale.com | 1650 | M: leoli@freescale.com |
1651 | P: Zhang Wei | ||
1652 | M: zw@zh-kernel.org | ||
1651 | L: linuxppc-embedded@ozlabs.org | 1653 | L: linuxppc-embedded@ozlabs.org |
1652 | L: linux-kernel@vger.kernel.org | 1654 | L: linux-kernel@vger.kernel.org |
1653 | S: Maintained | 1655 | S: Maintained |
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c index 762b729672e0..0ec0f431e6a1 100644 --- a/drivers/dma/iop-adma.c +++ b/drivers/dma/iop-adma.c | |||
@@ -821,10 +821,10 @@ static int __devinit iop_adma_memcpy_self_test(struct iop_adma_device *device) | |||
821 | 821 | ||
822 | dev_dbg(device->common.dev, "%s\n", __func__); | 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 | if (!src) | 825 | if (!src) |
826 | return -ENOMEM; | 826 | return -ENOMEM; |
827 | dest = kzalloc(sizeof(u8) * IOP_ADMA_TEST_SIZE, GFP_KERNEL); | 827 | dest = kzalloc(IOP_ADMA_TEST_SIZE, GFP_KERNEL); |
828 | if (!dest) { | 828 | if (!dest) { |
829 | kfree(src); | 829 | kfree(src); |
830 | return -ENOMEM; | 830 | return -ENOMEM; |
@@ -834,8 +834,6 @@ static int __devinit iop_adma_memcpy_self_test(struct iop_adma_device *device) | |||
834 | for (i = 0; i < IOP_ADMA_TEST_SIZE; i++) | 834 | for (i = 0; i < IOP_ADMA_TEST_SIZE; i++) |
835 | ((u8 *) src)[i] = (u8)i; | 835 | ((u8 *) src)[i] = (u8)i; |
836 | 836 | ||
837 | memset(dest, 0, IOP_ADMA_TEST_SIZE); | ||
838 | |||
839 | /* Start copy, using first DMA channel */ | 837 | /* Start copy, using first DMA channel */ |
840 | dma_chan = container_of(device->common.channels.next, | 838 | dma_chan = container_of(device->common.channels.next, |
841 | struct dma_chan, | 839 | struct dma_chan, |