2caf7fcdb8
This patch (as1197) fixes an error introduced recently. Since a significant number of devices can't handle Set-Interface requests, we no longer call usb_set_interface() when a driver unbinds from an interface, provided the interface is already in altsetting 0. However the interface still does get disabled, and the call to usb_set_interface() was the only thing re-enabling it. Since the interface doesn't get re-enabled, further attempts to use it fail. So the patch adds a call to usb_enable_interface() when a driver unbinds and the interface is in altsetting 0. For this to work right, the interface's endpoints have to be re-enabled but their toggles have to be left alone. Therefore an additional argument is added to usb_enable_endpoint() and usb_enable_interface(), a flag indicating whether or not the endpoint toggles should be reset. This is a forward-ported version of a patch which fixes Bugzilla #12301. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Reported-by: David Roka <roka@dawid.hu> Reported-by: Erik Ekman <erik@kryo.se> Tested-by: Erik Ekman <erik@kryo.se> Tested-by: Alon Bar-Lev <alon.barlev@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
165 lines
5.1 KiB
C
165 lines
5.1 KiB
C
#include <linux/pm.h>
|
|
|
|
/* Functions local to drivers/usb/core/ */
|
|
|
|
extern int usb_create_sysfs_dev_files(struct usb_device *dev);
|
|
extern void usb_remove_sysfs_dev_files(struct usb_device *dev);
|
|
extern int usb_create_sysfs_intf_files(struct usb_interface *intf);
|
|
extern void usb_remove_sysfs_intf_files(struct usb_interface *intf);
|
|
extern int usb_create_ep_devs(struct device *parent,
|
|
struct usb_host_endpoint *endpoint,
|
|
struct usb_device *udev);
|
|
extern void usb_remove_ep_devs(struct usb_host_endpoint *endpoint);
|
|
|
|
extern void usb_enable_endpoint(struct usb_device *dev,
|
|
struct usb_host_endpoint *ep, bool reset_toggle);
|
|
extern void usb_enable_interface(struct usb_device *dev,
|
|
struct usb_interface *intf, bool reset_toggles);
|
|
extern void usb_disable_endpoint(struct usb_device *dev, unsigned int epaddr);
|
|
extern void usb_disable_interface(struct usb_device *dev,
|
|
struct usb_interface *intf);
|
|
extern void usb_release_interface_cache(struct kref *ref);
|
|
extern void usb_disable_device(struct usb_device *dev, int skip_ep0);
|
|
extern int usb_deauthorize_device(struct usb_device *);
|
|
extern int usb_authorize_device(struct usb_device *);
|
|
extern void usb_detect_quirks(struct usb_device *udev);
|
|
|
|
extern int usb_get_device_descriptor(struct usb_device *dev,
|
|
unsigned int size);
|
|
extern char *usb_cache_string(struct usb_device *udev, int index);
|
|
extern int usb_set_configuration(struct usb_device *dev, int configuration);
|
|
extern int usb_choose_configuration(struct usb_device *udev);
|
|
|
|
extern void usb_kick_khubd(struct usb_device *dev);
|
|
extern int usb_match_device(struct usb_device *dev,
|
|
const struct usb_device_id *id);
|
|
extern void usb_forced_unbind_intf(struct usb_interface *intf);
|
|
extern void usb_rebind_intf(struct usb_interface *intf);
|
|
|
|
extern int usb_hub_init(void);
|
|
extern void usb_hub_cleanup(void);
|
|
extern int usb_major_init(void);
|
|
extern void usb_major_cleanup(void);
|
|
extern int usb_host_init(void);
|
|
extern void usb_host_cleanup(void);
|
|
|
|
#ifdef CONFIG_PM
|
|
|
|
extern int usb_suspend(struct device *dev, pm_message_t msg);
|
|
extern int usb_resume(struct device *dev, pm_message_t msg);
|
|
|
|
extern void usb_autosuspend_work(struct work_struct *work);
|
|
extern void usb_autoresume_work(struct work_struct *work);
|
|
extern int usb_port_suspend(struct usb_device *dev, pm_message_t msg);
|
|
extern int usb_port_resume(struct usb_device *dev, pm_message_t msg);
|
|
extern int usb_external_suspend_device(struct usb_device *udev,
|
|
pm_message_t msg);
|
|
extern int usb_external_resume_device(struct usb_device *udev,
|
|
pm_message_t msg);
|
|
|
|
static inline void usb_pm_lock(struct usb_device *udev)
|
|
{
|
|
mutex_lock_nested(&udev->pm_mutex, udev->level);
|
|
}
|
|
|
|
static inline void usb_pm_unlock(struct usb_device *udev)
|
|
{
|
|
mutex_unlock(&udev->pm_mutex);
|
|
}
|
|
|
|
#else
|
|
|
|
static inline int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int usb_port_resume(struct usb_device *udev, pm_message_t msg)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void usb_pm_lock(struct usb_device *udev) {}
|
|
static inline void usb_pm_unlock(struct usb_device *udev) {}
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_USB_SUSPEND
|
|
|
|
extern void usb_autosuspend_device(struct usb_device *udev);
|
|
extern void usb_try_autosuspend_device(struct usb_device *udev);
|
|
extern int usb_autoresume_device(struct usb_device *udev);
|
|
|
|
#else
|
|
|
|
#define usb_autosuspend_device(udev) do {} while (0)
|
|
#define usb_try_autosuspend_device(udev) do {} while (0)
|
|
static inline int usb_autoresume_device(struct usb_device *udev)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
#endif
|
|
|
|
extern struct workqueue_struct *ksuspend_usb_wq;
|
|
extern struct bus_type usb_bus_type;
|
|
extern struct device_type usb_device_type;
|
|
extern struct device_type usb_if_device_type;
|
|
extern struct usb_device_driver usb_generic_driver;
|
|
|
|
static inline int is_usb_device(const struct device *dev)
|
|
{
|
|
return dev->type == &usb_device_type;
|
|
}
|
|
|
|
/* Do the same for device drivers and interface drivers. */
|
|
|
|
static inline int is_usb_device_driver(struct device_driver *drv)
|
|
{
|
|
return container_of(drv, struct usbdrv_wrap, driver)->
|
|
for_devices;
|
|
}
|
|
|
|
/* Interfaces and their "power state" are owned by usbcore */
|
|
|
|
static inline void mark_active(struct usb_interface *f)
|
|
{
|
|
f->is_active = 1;
|
|
}
|
|
|
|
static inline void mark_quiesced(struct usb_interface *f)
|
|
{
|
|
f->is_active = 0;
|
|
}
|
|
|
|
static inline int is_active(const struct usb_interface *f)
|
|
{
|
|
return f->is_active;
|
|
}
|
|
|
|
|
|
/* for labeling diagnostics */
|
|
extern const char *usbcore_name;
|
|
|
|
/* sysfs stuff */
|
|
extern struct attribute_group *usb_device_groups[];
|
|
extern struct attribute_group *usb_interface_groups[];
|
|
|
|
/* usbfs stuff */
|
|
extern struct mutex usbfs_mutex;
|
|
extern struct usb_driver usbfs_driver;
|
|
extern const struct file_operations usbfs_devices_fops;
|
|
extern const struct file_operations usbdev_file_operations;
|
|
extern void usbfs_conn_disc_event(void);
|
|
extern void usb_fs_classdev_common_remove(struct usb_device *udev);
|
|
|
|
extern int usb_devio_init(void);
|
|
extern void usb_devio_cleanup(void);
|
|
|
|
/* internal notify stuff */
|
|
extern void usb_notify_add_device(struct usb_device *udev);
|
|
extern void usb_notify_remove_device(struct usb_device *udev);
|
|
extern void usb_notify_add_bus(struct usb_bus *ubus);
|
|
extern void usb_notify_remove_bus(struct usb_bus *ubus);
|
|
|