Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e338e49d authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'eisa' into next 

* eisa:
  EISA: Call put_device() if device_register() fails
parents 1d72e71d 04df008a

drivers/eisa/eisa-bus.c

+3 −1
Original line number Diff line number Diff line
@@ -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)