---

yaml
---
r: 321535
b: refs/heads/master
c: d680e2c
h: refs/heads/master
i:
  321533: 53b9d22
  321531: 78ad6c8
  321527: 5465cf6
  321519: 67b2c98
  321503: d5e7168
  321471: e6c015b
  321407: d64cd9f
  321279: b0bd910
  321023: 2363931
  320511: b066fb5
  319487: d09cb98
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38eaed327dc5bea2e5548ea3d195de83a2070c6d
+refs/heads/master: d680e2c11eb0ddd21ba438b3a537e2eb093ff86f

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;