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

Merge branch 'pci/julia-return-values' into next 

* pci/julia-return-values:
  PCI: hotplug: ensure a consistent return value in error case
parents 8d20e2cf 83d05710

drivers/pci/hotplug/cpci_hotplug_core.c

+10 −4
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ cpci_hp_register_bus(struct pci_bus *bus, u8 first, u8 last) 
	struct hotplug_slot *hotplug_slot;

	struct hotplug_slot_info *info;

	char name[SLOT_NAME_SIZE];

	int status = -ENOMEM;

	int status;

	int i;



	if (!(controller && bus))
@@ -237,18 +237,24 @@ cpci_hp_register_bus(struct pci_bus *bus, u8 first, u8 last) 
	 */

	for (i = first; i <= last; ++i) {

		slot = kzalloc(sizeof (struct slot), GFP_KERNEL);

		if (!slot)

		if (!slot) {

			status = -ENOMEM;

			goto error;

		}



		hotplug_slot =

			kzalloc(sizeof (struct hotplug_slot), GFP_KERNEL);

		if (!hotplug_slot)

		if (!hotplug_slot) {

			status = -ENOMEM;

			goto error_slot;

		}

		slot->hotplug_slot = hotplug_slot;



		info = kzalloc(sizeof (struct hotplug_slot_info), GFP_KERNEL);

		if (!info)

		if (!info) {

			status = -ENOMEM;

			goto error_hpslot;

		}

		hotplug_slot->info = info;



		slot->bus = bus;

drivers/pci/hotplug/cpqphp_core.c

+10 −4
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ static int ctrl_slot_setup(struct controller *ctrl, 
	u32 tempdword;

	char name[SLOT_NAME_SIZE];

	void __iomem *slot_entry= NULL;

	int result = -ENOMEM;

	int result;



	dbg("%s\n", __func__);
@@ -623,19 +623,25 @@ static int ctrl_slot_setup(struct controller *ctrl, 


	while (number_of_slots) {

		slot = kzalloc(sizeof(*slot), GFP_KERNEL);

		if (!slot)

		if (!slot) {

			result = -ENOMEM;

			goto error;

		}



		slot->hotplug_slot = kzalloc(sizeof(*(slot->hotplug_slot)),

						GFP_KERNEL);

		if (!slot->hotplug_slot)

		if (!slot->hotplug_slot) {

			result = -ENOMEM;

			goto error_slot;

		}

		hotplug_slot = slot->hotplug_slot;



		hotplug_slot->info = kzalloc(sizeof(*(hotplug_slot->info)),

							GFP_KERNEL);

		if (!hotplug_slot->info)

		if (!hotplug_slot->info) {

			result = -ENOMEM;

			goto error_hpslot;

		}

		hotplug_slot_info = hotplug_slot->info;



		slot->ctrl = ctrl;

drivers/pci/hotplug/pcihp_skeleton.c

+10 −4
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static int __init init_slots(void) 
	struct slot *slot;

	struct hotplug_slot *hotplug_slot;

	struct hotplug_slot_info *info;

	int retval = -ENOMEM;

	int retval;

	int i;



	/*
@@ -261,17 +261,23 @@ static int __init init_slots(void) 
	 */

	for (i = 0; i < num_slots; ++i) {

		slot = kzalloc(sizeof(*slot), GFP_KERNEL);

		if (!slot)

		if (!slot) {

			retval = -ENOMEM;

			goto error;

		}



		hotplug_slot = kzalloc(sizeof(*hotplug_slot), GFP_KERNEL);

		if (!hotplug_slot)

		if (!hotplug_slot) {

			retval = -ENOMEM;

			goto error_slot;

		}

		slot->hotplug_slot = hotplug_slot;



		info = kzalloc(sizeof(*info), GFP_KERNEL);

		if (!info)

		if (!info) {

			retval = -ENOMEM;

			goto error_hpslot;

		}

		hotplug_slot->info = info;



		slot->number = i;

drivers/pci/hotplug/shpchp_core.c

+10 −4
Original line number Diff line number Diff line
@@ -99,22 +99,28 @@ static int init_slots(struct controller *ctrl) 
	struct hotplug_slot *hotplug_slot;

	struct hotplug_slot_info *info;

	char name[SLOT_NAME_SIZE];

	int retval = -ENOMEM;

	int retval;

	int i;



	for (i = 0; i < ctrl->num_slots; i++) {

		slot = kzalloc(sizeof(*slot), GFP_KERNEL);

		if (!slot)

		if (!slot) {

			retval = -ENOMEM;

			goto error;

		}



		hotplug_slot = kzalloc(sizeof(*hotplug_slot), GFP_KERNEL);

		if (!hotplug_slot)

		if (!hotplug_slot) {

			retval = -ENOMEM;

			goto error_slot;

		}

		slot->hotplug_slot = hotplug_slot;



		info = kzalloc(sizeof(*info), GFP_KERNEL);

		if (!info)

		if (!info) {

			retval = -ENOMEM;

			goto error_hpslot;

		}

		hotplug_slot->info = info;



		slot->hp_slot = i;