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

Commit 6bc6cff5 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: add RESET_RESUME device quirk 



This patch (as888) adds a new USB device quirk for devices which are
unable to resume correctly.  By using the new code added for the
USB-persist facility, it is a simple matter to reset these devices
instead of resuming them.  To get things kicked off, a quirk entry is
added for the Philips PSC805.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 383975d7

drivers/usb/core/driver.c

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


#include <linux/device.h>

#include <linux/usb.h>

#include <linux/usb/quirks.h>

#include <linux/workqueue.h>

#include "hcd.h"

#include "usb.h"
@@ -835,6 +836,9 @@ static int usb_resume_device(struct usb_device *udev) 
		goto done;

	}



	if (udev->quirks & USB_QUIRK_RESET_RESUME)

		udev->reset_resume = 1;



	udriver = to_usb_device_driver(udev->dev.driver);

	status = udriver->resume(udev);

drivers/usb/core/hub.c

+5 −0
Original line number Diff line number Diff line
@@ -2939,6 +2939,11 @@ static int config_descriptors_changed(struct usb_device *udev) 
 * this from a driver probe() routine after downloading new firmware.

 * For calls that might not occur during probe(), drivers should lock

 * the device using usb_lock_device_for_reset().

 *

 * Locking exception: This routine may also be called from within an

 * autoresume handler.  Such usage won't conflict with other tasks

 * holding the device lock because these tasks should always call

 * usb_autopm_resume_device(), thereby preventing any unwanted autoresume.

 */

int usb_reset_device(struct usb_device *udev)

{

drivers/usb/core/quirks.c

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ static const struct usb_device_id usb_quirk_list[] = { 
	/* Elsa MicroLink 56k (V.250) */

	{ USB_DEVICE(0x05cc, 0x2267), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },



	/* Philips PSC805 audio device */

	{ USB_DEVICE(0x0471, 0x0155), .driver_info = USB_QUIRK_RESET_RESUME },



	{ }  /* terminating entry must be last */

};

include/linux/usb/quirks.h

+3 −0
Original line number Diff line number Diff line
@@ -9,3 +9,6 @@ 


/* string descriptors must not be fetched using a 255-byte read */

#define USB_QUIRK_STRING_FETCH_255	0x00000002



/* device can't resume correctly so reset it instead */

#define USB_QUIRK_RESET_RESUME		0x00000004