Skip to content

L
linux
Commit e338e49d authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files
Options

Merge branch 'eisa' into next 

* eisa:
  EISA: Call put_device() if device_register() fails
parents 1d72e71d 04df008a
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
drivers/eisa/eisa-bus.c
View file @ e338e49d
...@@ -232,8 +232,10 @@ static int __init eisa_init_device(struct eisa_root_device *root, ...@@ -232,8 +232,10 @@ static int __init eisa_init_device(struct eisa_root_device *root,
static int __init eisa_register_device(struct eisa_device *edev) static int __init eisa_register_device(struct eisa_device *edev)
{ {
int rc = device_register(&edev->dev); int rc = device_register(&edev->dev);
if (rc) if (rc) {
put_device(&edev->dev);
return rc; return rc;
}
rc = device_create_file(&edev->dev, &dev_attr_signature); rc = device_create_file(&edev->dev, &dev_attr_signature);
if (rc) if (rc)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7