|
@@ -560,7 +560,7 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
|
|
|
unsigned long flags)
|
|
|
{
|
|
|
struct dw_dma_chan *dwc = to_dw_dma_chan(chan);
|
|
|
- struct dw_dma_slave *dws = dwc->dws;
|
|
|
+ struct dw_dma_slave *dws = chan->private;
|
|
|
struct dw_desc *prev;
|
|
|
struct dw_desc *first;
|
|
|
u32 ctllo;
|
|
@@ -790,7 +790,7 @@ static int dwc_alloc_chan_resources(struct dma_chan *chan)
|
|
|
cfghi = DWC_CFGH_FIFO_MODE;
|
|
|
cfglo = 0;
|
|
|
|
|
|
- dws = dwc->dws;
|
|
|
+ dws = chan->private;
|
|
|
if (dws) {
|
|
|
/*
|
|
|
* We need controller-specific data to set up slave
|
|
@@ -866,7 +866,6 @@ static void dwc_free_chan_resources(struct dma_chan *chan)
|
|
|
spin_lock_bh(&dwc->lock);
|
|
|
list_splice_init(&dwc->free_list, &list);
|
|
|
dwc->descs_allocated = 0;
|
|
|
- dwc->dws = NULL;
|
|
|
|
|
|
/* Disable interrupts */
|
|
|
channel_clear_bit(dw, MASK.XFER, dwc->mask);
|