Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b5e2a7e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 737b0fbf eccf2144

MAINTAINERS

+4 −2
Original line number Diff line number Diff line
@@ -1646,8 +1646,10 @@ W: http://linux-fbdev.sourceforge.net/ 
S:	Maintained



FREESCALE DMA DRIVER

P;	Zhang Wei

M:	wei.zhang@freescale.com

P:	Li Yang

M:	leoli@freescale.com

P:	Zhang Wei

M:	zw@zh-kernel.org

L:	linuxppc-embedded@ozlabs.org

L:	linux-kernel@vger.kernel.org

S:	Maintained

drivers/dma/iop-adma.c

+2 −4
Original line number Diff line number Diff line
@@ -821,10 +821,10 @@ static int __devinit iop_adma_memcpy_self_test(struct iop_adma_device *device) 


	dev_dbg(device->common.dev, "%s\n", __func__);



	src = kzalloc(sizeof(u8) * IOP_ADMA_TEST_SIZE, GFP_KERNEL);

	src = kmalloc(IOP_ADMA_TEST_SIZE, GFP_KERNEL);

	if (!src)

		return -ENOMEM;

	dest = kzalloc(sizeof(u8) * IOP_ADMA_TEST_SIZE, GFP_KERNEL);

	dest = kzalloc(IOP_ADMA_TEST_SIZE, GFP_KERNEL);

	if (!dest) {

		kfree(src);

		return -ENOMEM;
@@ -834,8 +834,6 @@ static int __devinit iop_adma_memcpy_self_test(struct iop_adma_device *device) 
	for (i = 0; i < IOP_ADMA_TEST_SIZE; i++)

		((u8 *) src)[i] = (u8)i;



	memset(dest, 0, IOP_ADMA_TEST_SIZE);



	/* Start copy, using first DMA channel */

	dma_chan = container_of(device->common.channels.next,

				struct dma_chan,