* [PATCH] drivers/dma: handle sysfs errors
@ 2006-10-10 7:00 Jeff Garzik
0 siblings, 0 replies; only message in thread
From: Jeff Garzik @ 2006-10-10 7:00 UTC (permalink / raw)
To: Andrew Morton, LKML; +Cc: Chris Leech
Where is a MAINTAINER entry for drivers/dma, or even an email address in
the code?
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---
drivers/dma/dmaengine.c | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
08fb6a514ca6a9cdb07388e36d7f22cc2c0375e8
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index 1527804..dc65773 100644
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -312,7 +312,7 @@ void dma_async_client_chan_request(struc
int dma_async_device_register(struct dma_device *device)
{
static int id;
- int chancnt = 0;
+ int chancnt = 0, rc;
struct dma_chan* chan;
if (!device)
@@ -334,8 +334,15 @@ int dma_async_device_register(struct dma
snprintf(chan->class_dev.class_id, BUS_ID_SIZE, "dma%dchan%d",
device->dev_id, chan->chan_id);
+ rc = class_device_register(&chan->class_dev);
+ if (rc) {
+ chancnt--;
+ free_percpu(chan->local);
+ chan->local = NULL;
+ goto err_out;
+ }
+
kref_get(&device->refcount);
- class_device_register(&chan->class_dev);
}
mutex_lock(&dma_list_mutex);
@@ -345,6 +352,17 @@ int dma_async_device_register(struct dma
dma_chans_rebalance();
return 0;
+
+err_out:
+ list_for_each_entry(chan, &device->channels, device_node) {
+ if (chan->local == NULL)
+ continue;
+ kref_put(&device->refcount, dma_async_device_cleanup);
+ class_device_unregister(&chan->class_dev);
+ chancnt--;
+ free_percpu(chan->local);
+ }
+ return rc;
}
/**
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2006-10-10 7:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-10-10 7:00 [PATCH] drivers/dma: handle sysfs errors Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®