diff --git a/[refs] b/[refs] index a70b73d9b0e2..076355ba5319 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd59b8537f6cb53ab863fafad86a5828f1e889a2 +refs/heads/master: 6527de6d6d25ebfae7c7572cb7a4ed768e2e20a5 diff --git a/trunk/drivers/dma/fsldma.c b/trunk/drivers/dma/fsldma.c index ca70a21afc68..748e140c5a18 100644 --- a/trunk/drivers/dma/fsldma.c +++ b/trunk/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);