target/linux/s3c24xx/patches-2.6.26/0126-tracking-2.6.25-changed-s3c2410_dma_request-reurn.pa.patch

   1 From 6543660c429224f3cb8c9d16c786a521d0fc2969 Mon Sep 17 00:00:00 2001
   2 From: Andy Green <andy@openmoko.com>
   3 Date: Fri, 25 Jul 2008 23:06:06 +0100
   4 Subject: [PATCH] tracking-2.6.25-changed-s3c2410_dma_request-reurn.patch
   5
   6 s3c2410_dma_request used to return 0 for OK and something else
   7 for error, now it returns -ve error code or +ve dma channel index + flag
   8
   9 Signed-off-by: Andy Green <andy@openmoko.com>
  10 ---
  11  drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c |    3 ++-
  12  sound/soc/s3c24xx/s3c24xx-pcm.c        |    2 +-
  13  2 files changed, 3 insertions(+), 2 deletions(-)
  14
  15 diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
  16 index 8c3bbbc..af0066d 100644
  17 --- a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
  18 +++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
  19 @@ -1192,7 +1192,8 @@ static int s3c24xx_hcd_hw_init(struct s3c24xx_hcd_context * context)
  20
  21         }
  22
  23 -       if (s3c2410_dma_request(context->dma_channel, &s3c24xx_hcd_dma_client, NULL)) {
  24 +       if (s3c2410_dma_request(context->dma_channel, &s3c24xx_hcd_dma_client,
  25 +                                                                   NULL) < 0) {
  26                 DBG_PRINT(SDDBG_ERROR, ("unable to get DMA channel.\n"));
  27                 status = -ENOENT;
  28                 goto out_free_dma;
  29 diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c
  30 index 7806ae6..40abef1 100644
  31 --- a/sound/soc/s3c24xx/s3c24xx-pcm.c
  32 +++ b/sound/soc/s3c24xx/s3c24xx-pcm.c
  33 @@ -172,7 +172,7 @@ static int s3c24xx_pcm_hw_params(struct snd_pcm_substream *substream,
  34                                           prtd->params->client, NULL);
  35
  36                 if (ret < 0) {
  37 -                       DBG(KERN_ERR "failed to get dma channel\n");
  38 +                       DBG(KERN_ERR "failed to get dma channel: %d\n", ret);
  39                         return ret;
  40                 }
  41         }
  42 --
  43 1.5.6.3
  44