diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-04 02:52:14 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-04 02:52:14 -0500 |
| commit | cb9c34e6d090d376b77becaa5d29a65dec7f4272 (patch) | |
| tree | 3678abce20d6825aebe3fec218057d4131e13fd6 /drivers/dma/dmaengine.c | |
| parent | 470c66239ef0336429b35345f3f615d47341e13b (diff) | |
| parent | 061e41fdb5047b1fb161e89664057835935ca1d2 (diff) | |
Merge commit 'v2.6.28-rc7' into core/locking
Diffstat (limited to 'drivers/dma/dmaengine.c')
| -rw-r--r-- | drivers/dma/dmaengine.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index dc003a3a787d..5317e08221ec 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c | |||
| @@ -399,8 +399,8 @@ int dma_async_device_register(struct dma_device *device) | |||
| 399 | chan->chan_id = chancnt++; | 399 | chan->chan_id = chancnt++; |
| 400 | chan->dev.class = &dma_devclass; | 400 | chan->dev.class = &dma_devclass; |
| 401 | chan->dev.parent = device->dev; | 401 | chan->dev.parent = device->dev; |
| 402 | snprintf(chan->dev.bus_id, BUS_ID_SIZE, "dma%dchan%d", | 402 | dev_set_name(&chan->dev, "dma%dchan%d", |
| 403 | device->dev_id, chan->chan_id); | 403 | device->dev_id, chan->chan_id); |
| 404 | 404 | ||
| 405 | rc = device_register(&chan->dev); | 405 | rc = device_register(&chan->dev); |
| 406 | if (rc) { | 406 | if (rc) { |