Re: [2.6 patch] fix pciehp_free_irq()

[Kenji Kaneshige]

Adrian Bunk wrote:
> This patch fixes an obvious bug (loop was never entered) caused by
> commit 820943b6fc4781621dee52ba026106758a727dd3
> (pciehp: cleanup pcie_poll_cmd).
>
> Reported-by: Adrian Bunk <bunk@xxxxxxxxxx>
> Signed-off-by: Adrian Bunk <bunk@xxxxxxxxxx>
>
> ---
> 0cca78f4b7c7d6c7b64ae5acc08bb641454b4835 
> diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
> index ab31f5b..9d934dd 100644
> --- a/drivers/pci/hotplug/pciehp_hpc.c
> +++ b/drivers/pci/hotplug/pciehp_hpc.c
> @@ -250,23 +250,23 @@ static inline void pciehp_free_irq(struct controller *ctrl)
>  static int pcie_poll_cmd(struct controller *ctrl)
>  {
>  	u16 slot_status;
>  	int timeout = 1000;
>  
>  	if (!pciehp_readw(ctrl, SLOTSTATUS, &slot_status)) {
>  		if (slot_status & CMD_COMPLETED) {
>  			pciehp_writew(ctrl, SLOTSTATUS, CMD_COMPLETED);
>  			return 1;
>  		}
>  	}
> -	while (timeout > 1000) {
> +	while (timeout > 0) {
>  		msleep(10);
>  		timeout -= 10;
>  		if (!pciehp_readw(ctrl, SLOTSTATUS, &slot_status)) {
>  			if (slot_status & CMD_COMPLETED) {
>  				pciehp_writew(ctrl, SLOTSTATUS, CMD_COMPLETED);
>  				return 1;
>  			}
>  		}
>  	}
>  	return 0;	/* timeout */
>  }

Sorry, that's my bad.
Thank you for the patch, Adrian.

Acked-by: Kenji Kaneshige <kaneshige.kenji@xxxxxxxxxxxxxx>

Thanks,
Kenji Kaneshige


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/