diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2013-12-18 14:00:56 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-12-18 14:00:56 -0700 |
| commit | e338e49dbbbdef27b0a570603b60481b3753eddf (patch) | |
| tree | f3a1e58152848b2c1c593fb606f5f817a3913b85 | |
| parent | Merge branch 'pci/yijing-dev_is_pci' into next (diff) | |
| parent | EISA: Call put_device() if device_register() fails (diff) | |
| download | wireguard-linux-e338e49dbbbdef27b0a570603b60481b3753eddf.tar.xz wireguard-linux-e338e49dbbbdef27b0a570603b60481b3753eddf.zip | |
Merge branch 'eisa' into next
* eisa:
EISA: Call put_device() if device_register() fails
| -rw-r--r-- | drivers/eisa/eisa-bus.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/eisa/eisa-bus.c b/drivers/eisa/eisa-bus.c index 272a3ec35957..8842cde69177 100644 --- a/drivers/eisa/eisa-bus.c +++ b/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) |