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

Commit 52a23685 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (44 commits)
  USB: drivers/usb/storage/dpcm.c whitespace cleanup
  USB: r8a66597-hcd: fixes some problem
  USB: change name of spinlock in hcd.c
  USB: move routines in hcd.c
  USB: misc: uss720: clean up urb->status usage
  USB: misc: usbtest: clean up urb->status usage
  USB: misc: usblcd: clean up urb->status usage
  USB: misc: phidgetmotorcontrol: clean up urb->status usage
  USB: misc: phidgetkit: clean up urb->status usage
  USB: misc: legousbtower: clean up urb->status usage
  USB: misc: ldusb: clean up urb->status usage
  USB: misc: iowarrior: clean up urb->status usage
  USB: misc: ftdi-elan: clean up urb->status usage
  USB: misc: auerswald: clean up urb->status usage
  USB: misc: appledisplay: clean up urb->status usage
  USB: misc: adtux: clean up urb->status usage
  USB: core: message: clean up urb->status usage
  USB: image: microtek: clean up urb->status usage
  USB: image: mdc800: clean up urb->status usage
  USB: storage: onetouch: clean up urb->status usage
  ...
parents d046943c d20da3c3

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -329,6 +329,12 @@ P: Ivan Kokshaysky 
M:	ink@jurassic.park.msu.ru

S:	Maintained for 2.4; PCI support for 2.6.



AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER

P:	Thomas Dahlmann

M:	thomas.dahlmann@amd.com

L:	info-linux@geode.amd.com

S:	Supported



AMD GEODE PROCESSOR/CHIPSET SUPPORT

P:	Jordan Crouse

M:	info-linux@geode.amd.com

drivers/usb/atm/cxacru.c

+1 −2
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ static int cxacru_start_wait_urb(struct urb *urb, struct completion *done, 
				 int* actual_length)

{

	struct timer_list timer;

	int status;

	int status = urb->status;



	init_timer(&timer);

	timer.expires = jiffies + msecs_to_jiffies(CMD_TIMEOUT);
@@ -464,7 +464,6 @@ static int cxacru_start_wait_urb(struct urb *urb, struct completion *done, 
	timer.function = cxacru_timeout_kill;

	add_timer(&timer);

	wait_for_completion(done);

	status = urb->status;

	del_timer_sync(&timer);



	if (actual_length)

drivers/usb/atm/speedtch.c

+4 −3
Original line number Diff line number Diff line
@@ -612,7 +612,8 @@ static void speedtch_handle_int(struct urb *int_urb) 
	struct speedtch_instance_data *instance = int_urb->context;

	struct usbatm_data *usbatm = instance->usbatm;

	unsigned int count = int_urb->actual_length;

	int ret = int_urb->status;

	int status = int_urb->status;

	int ret;



	/* The magic interrupt for "up state" */

	static const unsigned char up_int[6]   = { 0xa1, 0x00, 0x01, 0x00, 0x00, 0x00 };
@@ -621,8 +622,8 @@ static void speedtch_handle_int(struct urb *int_urb) 


	atm_dbg(usbatm, "%s entered\n", __func__);



	if (ret < 0) {

		atm_dbg(usbatm, "%s: nonzero urb status %d!\n", __func__, ret);

	if (status < 0) {

		atm_dbg(usbatm, "%s: nonzero urb status %d!\n", __func__, status);

		goto fail;

	}

drivers/usb/atm/ueagle-atm.c

+4 −2
Original line number Diff line number Diff line
@@ -1308,11 +1308,13 @@ static void uea_intr(struct urb *urb) 
{

	struct uea_softc *sc = urb->context;

	struct intr_pkt *intr = urb->transfer_buffer;

	int status = urb->status;



	uea_enters(INS_TO_USBDEV(sc));



	if (unlikely(urb->status < 0)) {

	if (unlikely(status < 0)) {

		uea_err(INS_TO_USBDEV(sc), "uea_intr() failed with %d\n",

		       urb->status);

		       status);

		return;

	}

drivers/usb/atm/usbatm.c

+6 −5
Original line number Diff line number Diff line
@@ -257,9 +257,10 @@ static void usbatm_complete(struct urb *urb) 
{

	struct usbatm_channel *channel = urb->context;

	unsigned long flags;

	int status = urb->status;



	vdbg("%s: urb 0x%p, status %d, actual_length %d",

	     __func__, urb, urb->status, urb->actual_length);

	     __func__, urb, status, urb->actual_length);



	/* usually in_interrupt(), but not always */

	spin_lock_irqsave(&channel->lock, flags);
@@ -269,16 +270,16 @@ static void usbatm_complete(struct urb *urb) 


	spin_unlock_irqrestore(&channel->lock, flags);



	if (unlikely(urb->status) &&

	if (unlikely(status) &&

			(!(channel->usbatm->flags & UDSL_IGNORE_EILSEQ) ||

			 urb->status != -EILSEQ ))

			 status != -EILSEQ ))

	{

		if (urb->status == -ESHUTDOWN)

		if (status == -ESHUTDOWN)

			return;



		if (printk_ratelimit())

			atm_warn(channel->usbatm, "%s: urb 0x%p failed (%d)!\n",

				__func__, urb, urb->status);

				__func__, urb, status);

		/* throttle processing in case of an error */

		mod_timer(&channel->delay, jiffies + msecs_to_jiffies(THROTTLE_MSECS));

	} else