* [PATCH 03/14] mca: fix device_register() error handling
@ 2010-09-19 12:54 Vasiliy Kulikov
2010-09-19 16:53 ` walter harms
0 siblings, 1 reply; 2+ messages in thread
From: Vasiliy Kulikov @ 2010-09-19 12:54 UTC (permalink / raw)
To: kernel-janitors; +Cc: James Bottomley, linux-kernel
If device_register() fails then call put_device().
See comment to device_register.
Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
---
I cannot compile this driver, so it is not tested at all.
drivers/mca/mca-bus.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/drivers/mca/mca-bus.c b/drivers/mca/mca-bus.c
index ada5ebb..7162f08 100644
--- a/drivers/mca/mca-bus.c
+++ b/drivers/mca/mca-bus.c
@@ -116,8 +116,10 @@ int __init mca_register_device(int bus, struct mca_device *mca_dev)
mca_dev->dev.coherent_dma_mask = mca_dev->dma_mask;
rc = device_register(&mca_dev->dev);
- if (rc)
+ if (rc) {
+ put_device(&mca_dev->dev);
goto err_out;
+ }
rc = device_create_file(&mca_dev->dev, &dev_attr_id);
if (rc) goto err_out_devreg;
@@ -154,6 +156,7 @@ struct mca_bus * __devinit mca_attach_bus(int bus)
dev_set_name(&mca_bus->dev, "mca%d", bus);
sprintf(mca_bus->name,"Host %s MCA Bridge", bus ? "Secondary" : "Primary");
if (device_register(&mca_bus->dev)) {
+ put_device(&mca_bus->dev);
kfree(mca_bus);
return NULL;
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH 03/14] mca: fix device_register() error handling
2010-09-19 12:54 [PATCH 03/14] mca: fix device_register() error handling Vasiliy Kulikov
@ 2010-09-19 16:53 ` walter harms
0 siblings, 0 replies; 2+ messages in thread
From: walter harms @ 2010-09-19 16:53 UTC (permalink / raw)
To: Vasiliy Kulikov; +Cc: kernel-janitors, James Bottomley, linux-kernel
Vasiliy Kulikov schrieb:
> If device_register() fails then call put_device().
> See comment to device_register.
>
> Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
> ---
> I cannot compile this driver, so it is not tested at all.
>
> drivers/mca/mca-bus.c | 5 ++++-
> 1 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mca/mca-bus.c b/drivers/mca/mca-bus.c
> index ada5ebb..7162f08 100644
> --- a/drivers/mca/mca-bus.c
> +++ b/drivers/mca/mca-bus.c
> @@ -116,8 +116,10 @@ int __init mca_register_device(int bus, struct mca_device *mca_dev)
> mca_dev->dev.coherent_dma_mask = mca_dev->dma_mask;
>
> rc = device_register(&mca_dev->dev);
> - if (rc)
> + if (rc) {
> + put_device(&mca_dev->dev);
> goto err_out;
> + }
>
> rc = device_create_file(&mca_dev->dev, &dev_attr_id);
> if (rc) goto err_out_devreg;
> @@ -154,6 +156,7 @@ struct mca_bus * __devinit mca_attach_bus(int bus)
> dev_set_name(&mca_bus->dev, "mca%d", bus);
> sprintf(mca_bus->name,"Host %s MCA Bridge", bus ? "Secondary" : "Primary");
> if (device_register(&mca_bus->dev)) {
> + put_device(&mca_bus->dev);
> kfree(mca_bus);
> return NULL;
> }
just a minor: dev_set_name() is not check here. (But is in other places).
re,
wh
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-19 16:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-19 12:54 [PATCH 03/14] mca: fix device_register() error handling Vasiliy Kulikov
2010-09-19 16:53 ` walter harms
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox