summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2009-01-12 15:18:34 -0700
committerDan Williams <dan.j.williams@intel.com>2009-01-12 15:20:42 -0700
commit6527de6d6d25ebfae7c7572cb7a4ed768e2e20a5 (patch)
tree65d5a2abb226808f9135dda8f9affb6ae8aa4e01 /drivers/dma
parentdd59b8537f6cb53ab863fafad86a5828f1e889a2 (diff)
downloadop-kernel-dev-6527de6d6d25ebfae7c7572cb7a4ed768e2e20a5.zip
op-kernel-dev-6527de6d6d25ebfae7c7572cb7a4ed768e2e20a5.tar.gz
fsldma: use a valid 'device' for dma_pool_create
The dmaengine sysfs implementation was fixed to support proper lifetime rules which means that the current: new_fsl_chan->dev = &new_fsl_chan->common.dev->device; ...retrieves a NULL pointer because new_fsl_chan->common.dev has not been allocated at this point. So, set new_fsl_chan->dev to a valid device. Cc: Li Yang <leoli@freescale.com> Cc: Zhang Wei <zw@zh-kernel.org> Reported-by: Ira Snyder <iws@ovro.caltech.edu> Tested-by: Ira Snyder <iws@ovro.caltech.edu> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/fsldma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index ca70a21..748e140 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -822,7 +822,7 @@ static int __devinit fsl_dma_chan_probe(struct fsl_dma_device *fdev,
*/
WARN_ON(fdev->feature != new_fsl_chan->feature);
- new_fsl_chan->dev = &new_fsl_chan->common.dev->device;
+ new_fsl_chan->dev = fdev->dev;
new_fsl_chan->reg_base = ioremap(new_fsl_chan->reg.start,
new_fsl_chan->reg.end - new_fsl_chan->reg.start + 1);
OpenPOWER on IntegriCloud