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

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

pciehp: wait for 1000ms before LED operation after power off 



After turning power off, we must wait for at least 1 second *before*
LED operation.

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 d48b5d3a

drivers/pci/hotplug/pciehp_ctrl.c

+0 −12
Original line number Diff line number Diff line
@@ -195,12 +195,6 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot) 
			    __FUNCTION__);

			return;

		}

		/*

		 * After turning power off, we must wait for at least

		 * 1 second before taking any action that relies on

		 * power having been removed from the slot/adapter.

		 */

		msleep(1000);

	}

}
@@ -610,12 +604,6 @@ int pciehp_disable_slot(struct slot *p_slot) 
			mutex_unlock(&p_slot->ctrl->crit_sect);

			return -EINVAL;

		}

		/*

		 * After turning power off, we must wait for at least

		 * 1 second before taking any action that relies on

		 * power having been removed from the slot/adapter.

		 */

		msleep(1000);

	}



	ret = remove_board(p_slot);

drivers/pci/hotplug/pciehp_hpc.c

+7 −0
Original line number Diff line number Diff line
@@ -674,6 +674,13 @@ static int hpc_power_off_slot(struct slot * slot) 
	dbg("%s: SLOTCTRL %x write cmd %x\n",

	    __FUNCTION__, ctrl->cap_base + SLOTCTRL, slot_cmd);



	/*

	 * After turning power off, we must wait for at least 1 second

	 * before taking any action that relies on power having been

	 * removed from the slot/adapter.

	 */

	msleep(1000);



	return retval;

}