tegra: dma: add missing error return value

David Schalig · Rohan Somvanshi · commit 0ed0002d7609 · 2012-01-19T10:22:29.000-08:00
- add missing error code
- remove duplicate define

Bug 919369
Bug 919338

Change-Id: I03012050f3b6c4b7bda69657fdd5cb533dcd937e
Signed-off-by: David Schalig &lt;dschalig@nvidia.com&gt;
Reviewed-on: http://git-master/r/74521
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Scott Peterson &lt;speterson@nvidia.com&gt;
Reviewed-on: http://git-master/r/75544
Reviewed-by: Varun Wadekar &lt;vwadekar@nvidia.com&gt;
Tested-by: Varun Wadekar &lt;vwadekar@nvidia.com&gt;
diff --git a/arch/arm/mach-tegra/dma.c b/arch/arm/mach-tegra/dma.c
@@ -290,7 +290,7 @@ int tegra_dma_dequeue_req(struct tegra_dma_channel *ch,
 	}
 	if (!found) {
 		spin_unlock_irqrestore(&ch->lock, irq_flags);
-		return 0;
+		return -ENOENT;
 	}
 
 	if (!stop)
diff --git a/arch/arm/mach-tegra/include/mach/dma.h b/arch/arm/mach-tegra/include/mach/dma.h
@@ -59,7 +59,6 @@ struct tegra_dma_channel;
 #define TEGRA_DMA_REQ_SEL_I2C3			23
 #define TEGRA_DMA_REQ_SEL_DVC_I2C		24
 #define TEGRA_DMA_REQ_SEL_OWR			25
-#define TEGRA_DMA_REQ_SEL_OWR			25
 #define TEGRA_DMA_REQ_SEL_I2C4			26
 #define TEGRA_DMA_REQ_SEL_SL2B5			27
 #define TEGRA_DMA_REQ_SEL_SL2B6			28

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ int tegra_dma_dequeue_req(struct tegra_dma_channel *ch,`
`290`	`290`	`}`
`291`	`291`	`if (!found) {`
`292`	`292`	`spin_unlock_irqrestore(&ch->lock, irq_flags);`
`293`		`- return 0;`
	`293`	`+ return -ENOENT;`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`if (!stop)`