USB: serial: io_edgeport: fix NULL-deref at open

[pandora-kernel.git] / drivers / dma / timb_dma.c

diff --git a/drivers/dma/timb_dma.c b/drivers/dma/timb_dma.c
index f69f90a..a4a398f 100644 (file)
--- a/drivers/dma/timb_dma.c
+++ b/drivers/dma/timb_dma.c
@@ -753,7 +753,7 @@ static int __devinit td_probe(struct platform_device *pdev)
 
        INIT_LIST_HEAD(&td->dma.channels);
 
-       for (i = 0; i < pdata->nr_channels; i++, td->dma.chancnt++) {
+       for (i = 0; i < pdata->nr_channels; i++) {
                struct timb_dma_chan *td_chan = &td->channels[i];
                struct timb_dma_platform_data_channel *pchan =
                        pdata->channels + i;
@@ -762,12 +762,11 @@ static int __devinit td_probe(struct platform_device *pdev)
                if ((i % 2) == pchan->rx) {
                        dev_err(&pdev->dev, "Wrong channel configuration\n");
                        err = -EINVAL;
-                       goto err_tasklet_kill;
+                       goto err_free_irq;
                }
 
                td_chan->chan.device = &td->dma;
                td_chan->chan.cookie = 1;
-               td_chan->chan.chan_id = i;
                spin_lock_init(&td_chan->lock);
                INIT_LIST_HEAD(&td_chan->active_list);
                INIT_LIST_HEAD(&td_chan->queue);