Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 308051
b: refs/heads/master
c: abd9ccc
h: refs/heads/master
i:
  308049: dc38b84
  308047: cead081
v: v3
  • Loading branch information
Huang Shijie authored and Vinod Koul committed May 11, 2012
1 parent 5f8cc39 commit 14579df
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d3f797d93e593aa891f5b04a404b4ab45fd0e66a
refs/heads/master: abd9ccc84c35cf1e296335a7b655bba40c92386c
9 changes: 7 additions & 2 deletions trunk/drivers/dma/imx-sdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ struct sdma_channel {
enum dma_status status;
unsigned int chn_count;
unsigned int chn_real_count;
struct tasklet_struct tasklet;
};

#define IMX_DMA_SG_LOOP BIT(0)
Expand Down Expand Up @@ -534,8 +535,10 @@ static void mxc_sdma_handle_channel_normal(struct sdma_channel *sdmac)
sdmac->desc.callback(sdmac->desc.callback_param);
}

static void mxc_sdma_handle_channel(struct sdma_channel *sdmac)
static void sdma_tasklet(unsigned long data)
{
struct sdma_channel *sdmac = (struct sdma_channel *) data;

complete(&sdmac->done);

/* not interested in channel 0 interrupts */
Expand All @@ -560,7 +563,7 @@ static irqreturn_t sdma_int_handler(int irq, void *dev_id)
int channel = fls(stat) - 1;
struct sdma_channel *sdmac = &sdma->channel[channel];

mxc_sdma_handle_channel(sdmac);
tasklet_schedule(&sdmac->tasklet);

__clear_bit(channel, &stat);
}
Expand Down Expand Up @@ -1359,6 +1362,8 @@ static int __init sdma_probe(struct platform_device *pdev)
dma_cookie_init(&sdmac->chan);
sdmac->channel = i;

tasklet_init(&sdmac->tasklet, sdma_tasklet,
(unsigned long) sdmac);
/*
* Add the channel to the DMAC list. Do not add channel 0 though
* because we need it internally in the SDMA driver. This also means
Expand Down

0 comments on commit 14579df

Please sign in to comment.