diff options
| author | Sebastian Ott <sebott@linux.vnet.ibm.com> | 2009-09-11 10:28:38 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-09-11 10:29:45 +0200 |
| commit | c6304933274f8e3cc6983d496456757ac8ab2e0b (patch) | |
| tree | 7d9135cc2f391141650cc2d1740bd276a25f6141 /drivers/s390/char | |
| parent | c48ff644f2c86f34f69f382b68b16c6d30854783 (diff) | |
| download | linux-c6304933274f8e3cc6983d496456757ac8ab2e0b.tar.bz2 | |
[S390] proper use of device register
Don't use kfree directly after device registration started.
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/char')
| -rw-r--r-- | drivers/s390/char/monreader.c | 2 | ||||
| -rw-r--r-- | drivers/s390/char/vmlogrdr.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c index 3234e90bd7f9..89ece1c235aa 100644 --- a/drivers/s390/char/monreader.c +++ b/drivers/s390/char/monreader.c @@ -581,7 +581,7 @@ static int __init mon_init(void) monreader_device->release = (void (*)(struct device *))kfree; rc = device_register(monreader_device); if (rc) { - kfree(monreader_device); + put_device(monreader_device); goto out_driver; } diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c index c20a4fe6da51..d1a142fa3eb4 100644 --- a/drivers/s390/char/vmlogrdr.c +++ b/drivers/s390/char/vmlogrdr.c @@ -765,8 +765,10 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv) } else return -ENOMEM; ret = device_register(dev); - if (ret) + if (ret) { + put_device(dev); return ret; + } ret = sysfs_create_group(&dev->kobj, &vmlogrdr_attr_group); if (ret) { |