diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-09-04 15:07:35 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-04 15:07:35 +0200 |
| commit | 3fbb96d275989c604b343b9e39aeea50386756e9 (patch) | |
| tree | 6a066ece039f798f7d5a6b44453fc889e0e1cf8a /drivers/mtd/nand/omap2.c | |
| parent | 63487589bf96bfd3fb7d5531f2d966f29ffe397d (diff) | |
| parent | 863e99a8c1ea2b0391491904297f57a0f6a1fdd6 (diff) | |
| download | op-kernel-dev-3fbb96d275989c604b343b9e39aeea50386756e9.zip op-kernel-dev-3fbb96d275989c604b343b9e39aeea50386756e9.tar.gz | |
Merge branch 'cleanup/io-pci' into next/cleanup
The io-pci series has gained a merge to resolve a nontrivial
conflict.
* cleanup/io-pci:
ARM: Fix ioremap() of address zero
Also includes an update to Linux 3.6-rc3
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/mtd/nand/omap2.c')
| -rw-r--r-- | drivers/mtd/nand/omap2.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index e9309b3..ac4fd75 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -1245,7 +1245,6 @@ static int __devinit omap_nand_probe(struct platform_device *pdev) goto out_release_mem_region; } else { struct dma_slave_config cfg; - int rc; memset(&cfg, 0, sizeof(cfg)); cfg.src_addr = info->phys_base; @@ -1254,10 +1253,10 @@ static int __devinit omap_nand_probe(struct platform_device *pdev) cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; cfg.src_maxburst = 16; cfg.dst_maxburst = 16; - rc = dmaengine_slave_config(info->dma, &cfg); - if (rc) { + err = dmaengine_slave_config(info->dma, &cfg); + if (err) { dev_err(&pdev->dev, "DMA engine slave config failed: %d\n", - rc); + err); goto out_release_mem_region; } info->nand.read_buf = omap_read_buf_dma_pref; |
