diff options
| -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 e9309b3659e..ac4fd756eda 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;  |