[ARM] tegra: update i2s to use PTR_ERRless dma API
authorErik Gilling <konkers@android.com>
Wed, 1 Sep 2010 20:43:01 +0000 (13:43 -0700)
committerColin Cross <ccross@android.com>
Wed, 6 Oct 2010 23:28:24 +0000 (16:28 -0700)
Change-Id: I4bfe6ef64688244ae1d6a380891c7d94e2e243e7
Signed-off-by: Erik Gilling <konkers@android.com>
arch/arm/mach-tegra/tegra_i2s_audio.c

index 314bb0482d7f6bf2830842854368f57a61746c9a..65f1ec8a28fe3ab034f1854dfd98b207225351d0 100644 (file)
@@ -613,10 +613,10 @@ static int setup_dma(struct audio_driver_state *ads)
        BUG_ON(!ads->out.buf_phys);
        setup_dma_tx_request(&ads->out.dma_req, &ads->out);
        ads->out.dma_chan = tegra_dma_allocate_channel(TEGRA_DMA_MODE_ONESHOT);
-       if (IS_ERR(ads->out.dma_chan)) {
+       if (!ads->out.dma_chan) {
                pr_err("%s: could not allocate output I2S DMA channel: %ld\n",
                        __func__, PTR_ERR(ads->out.dma_chan));
-               rc = PTR_ERR(ads->out.dma_chan);
+               rc = -ENODEV;
                goto fail_tx;
        }
 
@@ -627,10 +627,10 @@ static int setup_dma(struct audio_driver_state *ads)
        BUG_ON(!ads->in.buf_phys);
        setup_dma_rx_request(&ads->in.dma_req, &ads->in);
        ads->in.dma_chan = tegra_dma_allocate_channel(TEGRA_DMA_MODE_ONESHOT);
-       if (IS_ERR(ads->in.dma_chan)) {
+       if (!ads->in.dma_chan) {
                pr_err("%s: could not allocate input I2S DMA channel: %ld\n",
                        __func__, PTR_ERR(ads->in.dma_chan));
-               rc = PTR_ERR(ads->in.dma_chan);
+               rc = -ENODEV;
                goto fail_rx;
        }