提交 e338e49d 编写于 作者: B Bjorn Helgaas

Merge branch 'eisa' into next

* eisa:
  EISA: Call put_device() if device_register() fails
...@@ -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% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册