Commit a759012e authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pnp' 

* pnp:
  PNPBIOS: check return value of pnp_add_device()
  PNP: Mark the function pnp_build_option() as static in resource.c
  PNP / card: add missing put_device() call
  PNPACPI: check return value of pnp_add_device()
parents bcc7201a d8254e0e

drivers/pnp/card.c

+1 −0
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ int pnp_add_card(struct pnp_card *card) 
	error = device_register(&card->dev);

	if (error) {

		dev_err(&card->dev, "could not register (err=%d)\n", error);

		put_device(&card->dev);

		return error;

	}

drivers/pnp/pnpacpi/core.c

+9 −2
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device) 
	struct pnp_dev *dev;

	char *pnpid;

	struct acpi_hardware_id *id;

	int error;



	/* Skip devices that are already bound */

	if (device->physical_node_count)
@@ -299,10 +300,16 @@ static int __init pnpacpi_add_device(struct acpi_device *device) 
	/* clear out the damaged flags */

	if (!dev->active)

		pnp_init_resources(dev);

	pnp_add_device(dev);



	error = pnp_add_device(dev);

	if (error) {

		put_device(&dev->dev);

		return error;

	}



	num++;



	return AE_OK;

	return 0;

}



static acpi_status __init pnpacpi_add_device_handler(acpi_handle handle,

drivers/pnp/pnpbios/core.c

+9 −3
Original line number Diff line number Diff line
@@ -312,18 +312,19 @@ static int __init insert_device(struct pnp_bios_node *node) 
	struct list_head *pos;

	struct pnp_dev *dev;

	char id[8];

	int error;



	/* check if the device is already added */

	list_for_each(pos, &pnpbios_protocol.devices) {

		dev = list_entry(pos, struct pnp_dev, protocol_list);

		if (dev->number == node->handle)

			return -1;

			return -EEXIST;

	}



	pnp_eisa_id_to_string(node->eisa_id & PNP_EISA_ID_MASK, id);

	dev = pnp_alloc_dev(&pnpbios_protocol, node->handle, id);

	if (!dev)

		return -1;

		return -ENOMEM;



	pnpbios_parse_data_stream(dev, node);

	dev->active = pnp_is_active(dev);
@@ -342,7 +343,12 @@ static int __init insert_device(struct pnp_bios_node *node) 
	if (!dev->active)

		pnp_init_resources(dev);



	pnp_add_device(dev);

	error = pnp_add_device(dev);

	if (error) {

		put_device(&dev->dev);

		return error;

	}



	pnpbios_interface_attach_device(node);



	return 0;

drivers/pnp/resource.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static int pnp_reserve_mem[16] = {[0 ... 15] = -1 }; /* reserve (don't use) some 
 * option registration

 */



struct pnp_option *pnp_build_option(struct pnp_dev *dev, unsigned long type,

static struct pnp_option *pnp_build_option(struct pnp_dev *dev, unsigned long type,

				    unsigned int option_flags)

{

	struct pnp_option *option;