diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-10-10 23:19:21 +0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-12-07 23:29:57 +0300 |
| commit | c1c9c7cd9f33ad6ff4407638060fe2730560bd56 (patch) | |
| tree | 9c8f6eb326ccdba907a64c99f1b1f75604b0ff85 /drivers/ieee1394/hosts.c | |
| parent | 1ed891c6d49e97ebd3305d8c6213246a14f0800f (diff) | |
| download | linux-c1c9c7cd9f33ad6ff4407638060fe2730560bd56.tar.xz | |
ieee1394: handle sysfs errors
Handle driver core errors with as much care as appropriate.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/ieee1394/hosts.c')
| -rw-r--r-- | drivers/ieee1394/hosts.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/drivers/ieee1394/hosts.c b/drivers/ieee1394/hosts.c index fbf17cfe79b0..ee82a5320bf7 100644 --- a/drivers/ieee1394/hosts.c +++ b/drivers/ieee1394/hosts.c @@ -131,10 +131,8 @@ struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra, return NULL; h->csr.rom = csr1212_create_csr(&csr_bus_ops, CSR_BUS_INFO_SIZE, h); - if (!h->csr.rom) { - kfree(h); - return NULL; - } + if (!h->csr.rom) + goto fail; h->hostdata = h + 1; h->driver = drv; @@ -173,11 +171,19 @@ struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra, h->class_dev.class = &hpsb_host_class; snprintf(h->class_dev.class_id, BUS_ID_SIZE, "fw-host%d", h->id); - device_register(&h->device); - class_device_register(&h->class_dev); + if (device_register(&h->device)) + goto fail; + if (class_device_register(&h->class_dev)) { + device_unregister(&h->device); + goto fail; + } get_device(&h->device); return h; + +fail: + kfree(h); + return NULL; } int hpsb_add_host(struct hpsb_host *host) |