Re: [patch added to the 3.12 stable tree] USB: fix build error with CONFIG_PM_RUNTIME disabled

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

This patch must be followed up with

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=a9ef803d740bfadf5e505fbc57efa57692e27025

cheers,
-roger

On 09/18/2014 05:07 PM, Jiri Slaby wrote:
> From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> 
> This patch has been added to the 3.12 stable tree. If you have any
> objections, please let us know.
> 
> ===============
> 
> commit a9ef803d740bfadf5e505fbc57efa57692e27025 upstream.
> 
> commit bdd405d2a528 ("usb: hub: Prevent hub autosuspend if
> usbcore.autosuspend is -1") causes a build error if CONFIG_PM_RUNTIME is
> disabled.  Fix that by doing a simple #ifdef guard around it.
> 
> Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Reported-by: kbuild test robot <fengguang.wu@xxxxxxxxx>
> Cc: Roger Quadros <rogerq@xxxxxx>
> Cc: Michael Welling <mwelling@xxxxxxxxxxx>
> Cc: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
> Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
> ---
>  drivers/usb/core/hub.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
> index 156fe93fb3d9..721de375c543 100644
> --- a/drivers/usb/core/hub.c
> +++ b/drivers/usb/core/hub.c
> @@ -1708,8 +1708,10 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
>  	 * - If user has indicated to prevent autosuspend by passing
>  	 *   usbcore.autosuspend = -1 then keep autosuspend disabled.
>  	 */
> +#ifdef CONFIG_PM_RUNTIME
>  	if (hdev->dev.power.autosuspend_delay >= 0)
>  		pm_runtime_set_autosuspend_delay(&hdev->dev, 0);
> +#endif
>  
>  	/*
>  	 * Hubs have proper suspend/resume support, except for root hubs
> 

--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]