瀏覽代碼

Merge branch 'eisa' into next

* eisa:
  EISA: Call put_device() if device_register() fails
Bjorn Helgaas 11 年之前
父節點
當前提交
e338e49dbb
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      drivers/eisa/eisa-bus.c

+ 3 - 1
drivers/eisa/eisa-bus.c

@@ -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)
 {
 	int rc = device_register(&edev->dev);
-	if (rc)
+	if (rc) {
+		put_device(&edev->dev);
 		return rc;
+	}
 
 	rc = device_create_file(&edev->dev, &dev_attr_signature);
 	if (rc)