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

Commit ba721d31 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: ACE1001 patch for cp2101.c
  USB: usbmon: fix read(2)
  USB: gadget rndis: send notifications
  USB: gadget rndis: stop windows self-immolation
  USB: storage: update unusual_devs entries for Nokia 5300 and 5310
  USB: storage: updates unusual_devs entry for the Nokia 6300
  usb: musb: fix bug in musb_schedule
  USB: fix SB700 usb subsystem hang bug
parents 0ca4b6b0 5091b587

drivers/usb/gadget/f_rndis.c

+1 −2
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ static struct usb_interface_descriptor rndis_data_intf __initdata = { 
	.bDescriptorType =	USB_DT_INTERFACE,



	/* .bInterfaceNumber = DYNAMIC */

	.bAlternateSetting =	1,

	.bNumEndpoints =	2,

	.bInterfaceClass =	USB_CLASS_CDC_DATA,

	.bInterfaceSubClass =	0,
@@ -303,7 +302,7 @@ static void rndis_response_available(void *_rndis) 
	__le32				*data = req->buf;

	int				status;



	if (atomic_inc_return(&rndis->notify_count))

	if (atomic_inc_return(&rndis->notify_count) != 1)

		return;



	/* Send RNDIS RESPONSE_AVAILABLE notification; a

drivers/usb/host/ehci-pci.c

+21 −0
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ static int ehci_pci_setup(struct usb_hcd *hcd) 
{

	struct ehci_hcd		*ehci = hcd_to_ehci(hcd);

	struct pci_dev		*pdev = to_pci_dev(hcd->self.controller);

	struct pci_dev		*p_smbus;

	u8			rev;

	u32			temp;

	int			retval;
@@ -166,6 +168,25 @@ static int ehci_pci_setup(struct usb_hcd *hcd) 
			pci_write_config_byte(pdev, 0x4b, tmp | 0x20);

		}

		break;

	case PCI_VENDOR_ID_ATI:

		/* SB700 old version has a bug in EHCI controller,

		 * which causes usb devices lose response in some cases.

		 */

		if (pdev->device == 0x4396) {

			p_smbus = pci_get_device(PCI_VENDOR_ID_ATI,

						 PCI_DEVICE_ID_ATI_SBX00_SMBUS,

						 NULL);

			if (!p_smbus)

				break;

			rev = p_smbus->revision;

			if ((rev == 0x3a) || (rev == 0x3b)) {

				u8 tmp;

				pci_read_config_byte(pdev, 0x53, &tmp);

				pci_write_config_byte(pdev, 0x53, tmp | (1<<3));

			}

			pci_dev_put(p_smbus);

		}

		break;

	}



	ehci_reset(ehci);

drivers/usb/mon/mon_bin.c

+4 −1
Original line number Diff line number Diff line
@@ -687,7 +687,10 @@ static ssize_t mon_bin_read(struct file *file, char __user *buf, 
	}



	if (rp->b_read >= sizeof(struct mon_bin_hdr)) {

		step_len = min(nbytes, (size_t)ep->len_cap);

		step_len = ep->len_cap;

		step_len -= rp->b_read - sizeof(struct mon_bin_hdr);

		if (step_len > nbytes)

			step_len = nbytes;

		offset = rp->b_out + PKT_SIZE;

		offset += rp->b_read - sizeof(struct mon_bin_hdr);

		if (offset >= rp->b_size)

drivers/usb/musb/musb_host.c

+1 −1
Original line number Diff line number Diff line
@@ -1757,7 +1757,7 @@ static int musb_schedule( 
		}

	}

	/* use bulk reserved ep1 if no other ep is free */

	if (best_end > 0 && qh->type == USB_ENDPOINT_XFER_BULK) {

	if (best_end < 0 && qh->type == USB_ENDPOINT_XFER_BULK) {

		hw_ep = musb->bulk_ep;

		if (is_in)

			head = &musb->in_bulk;

drivers/usb/serial/cp2101.c

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ static void cp2101_shutdown(struct usb_serial *); 
static int debug;



static struct usb_device_id id_table [] = {

	{ USB_DEVICE(0x0471, 0x066A) }, /* AKTAKOM ACE-1001 cable */

	{ USB_DEVICE(0x0489, 0xE000) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */

	{ USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */

	{ USB_DEVICE(0x0FCF, 0x1003) }, /* Dynastream ANT development board */