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

Commit c6c59927 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: (32 commits)
  USB: serial: no unnecessary GFP_ATOMIC in oti6858
  USB: serial: fix race between unthrottle and completion handler in visor
  USB: serial: fix assumption that throttle/unthrottle cannot sleep
  USB: serial: fix race between unthrottle and completion handler in symbolserial
  USB: serial: fix race between unthrottle and completion handler in opticon
  USB: ehci: Fix isoc scheduling boundary checking.
  USB: storage: When a device returns no sense data, call it a Hardware Error
  USB: small fix in error case of suspend in generic usbserial code
  USB: visor: fix trivial accounting bug in visor driver
  USB: Fix throttling in generic usbserial driver
  USB: cp210x: Add support for the DW700 UART
  USB: ipaq: fix oops when device is plugged in
  USB: isp1362: fix build warnings on 64-bit systems
  USB: gadget: imx_udc: Use resource size
  USB: storage: iRiver P7 UNUSUAL_DEV patch
  USB: musb: make HAVE_CLK support optional
  USB: xhci: Fix dropping endpoints from the xHC schedule.
  USB: xhci: Don't wait for a disable slot cmd when HC dies.
  USB: xhci: Handle canceled URBs when HC dies.
  USB: xhci: Stop debugging polling loop when HC dies.
  ...
parents ff945afb 40d28582

drivers/usb/class/usbtmc.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#define USBTMC_SIZE_IOBUFFER	2048



/* Default USB timeout (in milliseconds) */

#define USBTMC_TIMEOUT		10

#define USBTMC_TIMEOUT		5000



/*

 * Maximum number of read cycles to empty bulk in endpoint during CLEAR and

drivers/usb/gadget/imx_udc.c

+4 −4
Original line number Diff line number Diff line
@@ -1402,7 +1402,8 @@ static int __init imx_udc_probe(struct platform_device *pdev) 
	struct clk *clk;

	void __iomem *base;

	int ret = 0;

	int i, res_size;

	int i;

	resource_size_t res_size;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {
@@ -1416,7 +1417,7 @@ static int __init imx_udc_probe(struct platform_device *pdev) 
		return -ENODEV;

	}



	res_size = res->end - res->start + 1;

	res_size = resource_size(res);

	if (!request_mem_region(res->start, res_size, res->name)) {

		dev_err(&pdev->dev, "can't allocate %d bytes at %d address\n",

			res_size, res->start);
@@ -1527,8 +1528,7 @@ static int __exit imx_udc_remove(struct platform_device *pdev) 
	clk_disable(imx_usb->clk);

	iounmap(imx_usb->base);



	release_mem_region(imx_usb->res->start,

		imx_usb->res->end - imx_usb->res->start + 1);

	release_mem_region(imx_usb->res->start, resource_size(imx_usb->res));



	if (pdata->exit)

		pdata->exit(&pdev->dev);

drivers/usb/host/ehci-sched.c

+1 −0
Original line number Diff line number Diff line
@@ -1425,6 +1425,7 @@ iso_stream_schedule ( 
			status = -EFBIG;

			goto fail;

		}

		stream->next_uframe = start;

		goto ready;

	}

drivers/usb/host/isp1362-hcd.c

+9 −9
Original line number Diff line number Diff line
@@ -2284,10 +2284,10 @@ static int isp1362_mem_config(struct usb_hcd *hcd) 
	dev_info(hcd->self.controller, "ISP1362 Memory usage:\n");

	dev_info(hcd->self.controller, "  ISTL:    2 * %4d:     %4d @ $%04x:$%04x\n",

		 istl_size / 2, istl_size, 0, istl_size / 2);

	dev_info(hcd->self.controller, "  INTL: %4d * (%3u+8):  %4d @ $%04x\n",

	dev_info(hcd->self.controller, "  INTL: %4d * (%3lu+8):  %4d @ $%04x\n",

		 ISP1362_INTL_BUFFERS, intl_blksize - PTD_HEADER_SIZE,

		 intl_size, istl_size);

	dev_info(hcd->self.controller, "  ATL : %4d * (%3u+8):  %4d @ $%04x\n",

	dev_info(hcd->self.controller, "  ATL : %4d * (%3lu+8):  %4d @ $%04x\n",

		 atl_buffers, atl_blksize - PTD_HEADER_SIZE,

		 atl_size, istl_size + intl_size);

	dev_info(hcd->self.controller, "  USED/FREE:   %4d      %4d\n", total,
@@ -2677,12 +2677,12 @@ static int __devexit isp1362_remove(struct platform_device *pdev) 
	DBG(0, "%s: Removing HCD\n", __func__);

	usb_remove_hcd(hcd);



	DBG(0, "%s: Unmapping data_reg @ %08x\n", __func__,

	    (u32)isp1362_hcd->data_reg);

	DBG(0, "%s: Unmapping data_reg @ %p\n", __func__,

	    isp1362_hcd->data_reg);

	iounmap(isp1362_hcd->data_reg);



	DBG(0, "%s: Unmapping addr_reg @ %08x\n", __func__,

	    (u32)isp1362_hcd->addr_reg);

	DBG(0, "%s: Unmapping addr_reg @ %p\n", __func__,

	    isp1362_hcd->addr_reg);

	iounmap(isp1362_hcd->addr_reg);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
@@ -2810,16 +2810,16 @@ static int __init isp1362_probe(struct platform_device *pdev) 
	return 0;



 err6:

	DBG(0, "%s: Freeing dev %08x\n", __func__, (u32)isp1362_hcd);

	DBG(0, "%s: Freeing dev %p\n", __func__, isp1362_hcd);

	usb_put_hcd(hcd);

 err5:

	DBG(0, "%s: Unmapping data_reg @ %08x\n", __func__, (u32)data_reg);

	DBG(0, "%s: Unmapping data_reg @ %p\n", __func__, data_reg);

	iounmap(data_reg);

 err4:

	DBG(0, "%s: Releasing mem region %08lx\n", __func__, (long unsigned int)data->start);

	release_mem_region(data->start, resource_len(data));

 err3:

	DBG(0, "%s: Unmapping addr_reg @ %08x\n", __func__, (u32)addr_reg);

	DBG(0, "%s: Unmapping addr_reg @ %p\n", __func__, addr_reg);

	iounmap(addr_reg);

 err2:

	DBG(0, "%s: Releasing mem region %08lx\n", __func__, (long unsigned int)addr->start);

drivers/usb/host/isp1362.h

+6 −6
Original line number Diff line number Diff line
@@ -580,7 +580,7 @@ static inline const char *ISP1362_INT_NAME(int n) 


static inline void ALIGNSTAT(struct isp1362_hcd *isp1362_hcd, void *ptr)

{

	unsigned p = (unsigned)ptr;

	unsigned long p = (unsigned long)ptr;

	if (!(p & 0xf))

		isp1362_hcd->stat16++;

	else if (!(p & 0x7))
@@ -770,7 +770,7 @@ static void isp1362_write_fifo(struct isp1362_hcd *isp1362_hcd, void *buf, u16 l 
	if (!len)

		return;



	if ((unsigned)dp & 0x1) {

	if ((unsigned long)dp & 0x1) {

		/* not aligned */

		for (; len > 1; len -= 2) {

			data = *dp++;
@@ -962,8 +962,8 @@ static void isp1362_read_buffer(struct isp1362_hcd *isp1362_hcd, void *buf, u16 


	isp1362_write_diraddr(isp1362_hcd, offset, len);



	DBG(3, "%s: Reading %d byte from buffer @%04x to memory @ %08x\n", __func__,

	    len, offset, (u32)buf);

	DBG(3, "%s: Reading %d byte from buffer @%04x to memory @ %p\n",

	    __func__, len, offset, buf);



	isp1362_write_reg16(isp1362_hcd, HCuPINT, HCuPINT_EOT);

	_WARN_ON((isp1362_read_reg16(isp1362_hcd, HCuPINT) & HCuPINT_EOT));
@@ -982,8 +982,8 @@ static void isp1362_write_buffer(struct isp1362_hcd *isp1362_hcd, void *buf, u16 


	isp1362_write_diraddr(isp1362_hcd, offset, len);



	DBG(3, "%s: Writing %d byte to buffer @%04x from memory @ %08x\n", __func__,

	    len, offset, (u32)buf);

	DBG(3, "%s: Writing %d byte to buffer @%04x from memory @ %p\n",

	    __func__, len, offset, buf);



	isp1362_write_reg16(isp1362_hcd, HCuPINT, HCuPINT_EOT);

	_WARN_ON((isp1362_read_reg16(isp1362_hcd, HCuPINT) & HCuPINT_EOT));