From 543c1ed67e88f6d6ab7317c880746957479d9a18 Mon Sep 17 00:00:00 2001 From: Haavard Skinnemoen Date: Tue, 8 Jul 2008 11:58:05 -0700 Subject: [PATCH] --- yaml --- r: 105056 b: refs/heads/master c: 1099dc79245719c046e632212ec09d6ec1154ef5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/dma/dmaengine.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d32134b95360..2b2de610e574 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 65bc3ffe8c067e387fe5557bc3ea5071071f6af9 +refs/heads/master: 1099dc79245719c046e632212ec09d6ec1154ef5 diff --git a/trunk/drivers/dma/dmaengine.c b/trunk/drivers/dma/dmaengine.c index 97b329e76798..99c22b42bada 100644 --- a/trunk/drivers/dma/dmaengine.c +++ b/trunk/drivers/dma/dmaengine.c @@ -378,7 +378,7 @@ int dma_async_device_register(struct dma_device *device) chan->chan_id = chancnt++; chan->dev.class = &dma_devclass; - chan->dev.parent = NULL; + chan->dev.parent = device->dev; snprintf(chan->dev.bus_id, BUS_ID_SIZE, "dma%dchan%d", device->dev_id, chan->chan_id);