diff options
| author | Andy Green <andy@openmoko.com> | 2008-11-19 17:09:41 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-19 17:09:41 +0000 |
| commit | a7feadf3c493ed61c0d9481626f9c5506f87ff85 (patch) | |
| tree | 6b5aa2d1edecfc7d2ee7fb98e3a3529f665587a7 | |
| parent | e2d65a563d680c425bb5fc95c0b38c7ee3e65331 (diff) | |
tracking-2.6.25-changed-s3c2410_dma_request-reurn.patch
s3c2410_dma_request used to return 0 for OK and something else
for error, now it returns -ve error code or +ve dma channel index + flag
Signed-off-by: Andy Green <andy@openmoko.com>
| -rw-r--r-- | drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c | 3 | ||||
| -rw-r--r-- | sound/soc/s3c24xx/s3c24xx-pcm.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c index 8c3bbbc4922..af0066d9a96 100644 --- a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c +++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c @@ -1192,7 +1192,8 @@ static int s3c24xx_hcd_hw_init(struct s3c24xx_hcd_context * context) } - if (s3c2410_dma_request(context->dma_channel, &s3c24xx_hcd_dma_client, NULL)) { + if (s3c2410_dma_request(context->dma_channel, &s3c24xx_hcd_dma_client, + NULL) < 0) { DBG_PRINT(SDDBG_ERROR, ("unable to get DMA channel.\n")); status = -ENOENT; goto out_free_dma; diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c index e13e614bada..bfd0abaac88 100644 --- a/sound/soc/s3c24xx/s3c24xx-pcm.c +++ b/sound/soc/s3c24xx/s3c24xx-pcm.c @@ -168,7 +168,7 @@ static int s3c24xx_pcm_hw_params(struct snd_pcm_substream *substream, prtd->params->client, NULL); if (ret < 0) { - DBG(KERN_ERR "failed to get dma channel\n"); + DBG(KERN_ERR "failed to get dma channel: %d\n", ret); return ret; } } |