Commit 4ed33505 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: usbfs: Add a capability flag for runtime suspend 



The recent commit 7794f486 ("usbfs: Add ioctls for runtime power
management") neglected to add a corresponding capability flag.  This
patch rectifies the omission.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
CC: Mayuresh Kulkarni <mkulkarni@opensource.cirrus.com>

Link: https://lore.kernel.org/r/Pine.LNX.4.44L0.1908131613490.1941-100000@iolanthe.rowland.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 115f3bad

drivers/usb/core/devio.c

+8 −1
Original line number Diff line number Diff line
@@ -44,6 +44,12 @@ 


#include "usb.h"



#ifdef CONFIG_PM

#define MAYBE_CAP_SUSPEND	USBDEVFS_CAP_SUSPEND

#else

#define MAYBE_CAP_SUSPEND	0

#endif



#define USB_MAXBUS			64

#define USB_DEVICE_MAX			(USB_MAXBUS * 128)

#define USB_SG_SIZE			16384 /* split-size for large txs */
@@ -2310,7 +2316,8 @@ static int proc_get_capabilities(struct usb_dev_state *ps, void __user *arg) 


	caps = USBDEVFS_CAP_ZERO_PACKET | USBDEVFS_CAP_NO_PACKET_SIZE_LIM |

			USBDEVFS_CAP_REAP_AFTER_DISCONNECT | USBDEVFS_CAP_MMAP |

			USBDEVFS_CAP_DROP_PRIVILEGES | USBDEVFS_CAP_CONNINFO_EX;

			USBDEVFS_CAP_DROP_PRIVILEGES |

			USBDEVFS_CAP_CONNINFO_EX | MAYBE_CAP_SUSPEND;

	if (!ps->dev->bus->no_stop_on_short)

		caps |= USBDEVFS_CAP_BULK_CONTINUATION;

	if (ps->dev->bus->sg_tablesize)

include/uapi/linux/usbdevice_fs.h

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ struct usbdevfs_hub_portinfo { 
#define USBDEVFS_CAP_MMAP			0x20

#define USBDEVFS_CAP_DROP_PRIVILEGES		0x40

#define USBDEVFS_CAP_CONNINFO_EX		0x80

#define USBDEVFS_CAP_SUSPEND			0x100



/* USBDEVFS_DISCONNECT_CLAIM flags & struct */

CRA Git | Maintained and supported by SUSTech CRA and CCSE