From 695fbece37b82e09342dc3d0411b86d5532742a0 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Sat, 4 Aug 2012 11:05:25 +0000 Subject: [PATCH] --- yaml --- r: 321535 b: refs/heads/master c: d680e2c11eb0ddd21ba438b3a537e2eb093ff86f h: refs/heads/master i: 321533: 53b9d220c4a7eaac8eb71f646a3f973543ddf8bb 321531: 78ad6c80dd04328ee2574cc46142f40baa25d11a 321527: 5465cf637cf7dcd40f4f02ae59dee7060999218a 321519: 67b2c98a9f17ecdd8875339fdafc2d06f7302d73 321503: d5e71682f123e871b5d69eb9e1e08d356b711a1f 321471: e6c015bd7dcae70bb4823a9f19e89d12a5d10256 321407: d64cd9f082e66c25ac083a958662175a5c389434 321279: b0bd9101491a2a3866dc689450183afa9bff27a2 321023: 23639312041f42b8c0506280605e457c896dac14 320511: b066fb5de455303fee461cf2954b7df38841b434 319487: d09cb989ffa8800a3477e11992a2dc4609747e6f v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/omap2.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1a09c1ef8998..5238eff50dd6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38eaed327dc5bea2e5548ea3d195de83a2070c6d +refs/heads/master: d680e2c11eb0ddd21ba438b3a537e2eb093ff86f diff --git a/trunk/drivers/mtd/nand/omap2.c b/trunk/drivers/mtd/nand/omap2.c index e9309b3659e7..ac4fd756eda3 100644 --- a/trunk/drivers/mtd/nand/omap2.c +++ b/trunk/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;