From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Aug 2011 23:46:37 +0000 (-1000)
Subject: Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: MMI-PSA29.97-13-9~18705
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=12ff47e7f5fb64c566f62e6cf6a3b291c51bd337;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

* 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (37 commits)
  Improve slave/cyclic DMA engine documentation
  dmaengine: pl08x: handle the rest of enums in pl08x_width
  DMA: PL08x: cleanup selection of burst size
  DMA: PL08x: avoid recalculating cctl at each prepare
  DMA: PL08x: cleanup selection of buswidth
  DMA: PL08x: constify plchan->cd and plat->slave_channels
  DMA: PL08x: separately store source/destination cctl
  DMA: PL08x: separately store source/destination slave address
  DMA: PL08x: clean up LLI debugging
  DMA: PL08x: select LLI bus only once per LLI setup
  DMA: PL08x: remove unused constants
  ARM: mxs-dma: reset after disable channel
  dma: intel_mid_dma: remove redundant pci_set_drvdata calls
  dma: mxs-dma: fix unterminated platform_device_id table
  dmaengine: pl330: make platform data optional
  dmaengine: imx-sdma: return proper error if kzalloc fails
  pch_dma: Fix CTL register access issue
  dmaengine: mxs-dma: skip request_irq for NO_IRQ
  dmaengine/coh901318: fix slave submission semantics
  dmaengine/ste_dma40: allow memory buswidth/burst to be configured
  ...

Fix trivial whitespace conflict in drivers/dma/mv_xor.c
---

12ff47e7f5fb64c566f62e6cf6a3b291c51bd337
diff --cc drivers/dma/imx-sdma.c
index 1eb60ded2f0d,ec53980f8fcf..7bd7e98548cd
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@@ -1305,12 -1281,12 +1305,14 @@@ static int __init sdma_probe(struct pla
  		goto err_request_irq;
  
  	sdma->script_addrs = kzalloc(sizeof(*sdma->script_addrs), GFP_KERNEL);
- 	if (!sdma->script_addrs)
+ 	if (!sdma->script_addrs) {
+ 		ret = -ENOMEM;
  		goto err_alloc;
+ 	}
  
 -	sdma->version = pdata->sdma_version;
 +	if (of_id)
 +		pdev->id_entry = of_id->data;
 +	sdma->devtype = pdev->id_entry->driver_data;
  
  	dma_cap_set(DMA_SLAVE, sdma->dma_device.cap_mask);
  	dma_cap_set(DMA_CYCLIC, sdma->dma_device.cap_mask);