mirror of https://github.com/hak5/openwrt.git
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
|
From 31ab776ee952e5ef6e0a21be276686b84187fcaa Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ben Dooks <ben-linux@fluff.org>
|
||
|
|
Date: Sun, 10 Aug 2008 09:29:14 +0100
|
||
|
|
Subject: [PATCH] The driver should be checking for a negative error code from
|
||
|
|
s3c2410_dma_request(), not non-zero. Newer kernels now return
|
||
|
|
the DMA channel number that was allocated by the request.
|
||
|
|
|
||
|
|
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
|
||
|
|
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
|
||
|
|
(cherry picked from commit 3886ff5f63f33c801ed3af265ac0df20d3a8dcf5)
|
||
|
|
---
|
||
|
|
drivers/mmc/host/s3cmci.c | 2 +-
|
||
|
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
|
||
|
|
index 107847a..ffba0f9 100644
|
||
|
|
--- a/drivers/mmc/host/s3cmci.c
|
||
|
|
+++ b/drivers/mmc/host/s3cmci.c
|
||
|
|
@@ -1230,7 +1230,7 @@ static int s3cmci_probe(struct platform_device *pdev, int is2440)
|
||
|
|
s3c2410_gpio_cfgpin(host->pdata->gpio_wprotect,
|
||
|
|
S3C2410_GPIO_INPUT);
|
||
|
|
|
||
|
|
- if (s3c2410_dma_request(host->dma, &s3cmci_dma_client, NULL)) {
|
||
|
|
+ if (s3c2410_dma_request(host->dma, &s3cmci_dma_client, NULL) < 0) {
|
||
|
|
dev_err(&pdev->dev, "unable to get DMA channel.\n");
|
||
|
|
ret = -EBUSY;
|
||
|
|
goto probe_free_irq;
|
||
|
|
--
|
||
|
|
1.5.6.3
|
||
|
|
|