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

Commit c1ef5cbd authored by Kenji Kaneshige's avatar Kenji Kaneshige Committed by Greg Kroah-Hartman
Browse files

pci: hotplug: pciehp: fix error code path in hpc_power_off_slot 



Fix the error code path in hpc_power_off_slot().

The Bad DLLP Mask bit must be restored before return.

Signed-off-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 90a1ba0c

drivers/pci/hotplug/pciehp_hpc.c

+3 −2
Original line number Diff line number Diff line
@@ -711,7 +711,8 @@ static int hpc_power_off_slot(struct slot * slot) 
	retval = pcie_write_cmd(slot, slot_cmd, cmd_mask);

	if (retval) {

		err("%s: Write command failed!\n", __FUNCTION__);

		return -1;

		retval = -1;

		goto out;

	}

	dbg("%s: SLOTCTRL %x write cmd %x\n",

	    __FUNCTION__, ctrl->cap_base + SLOTCTRL, slot_cmd);
@@ -722,7 +723,7 @@ static int hpc_power_off_slot(struct slot * slot) 
	 * removed from the slot/adapter.

	 */

	msleep(1000);



 out:

	if (changed)

		pcie_unmask_bad_dllp(ctrl);