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

Commit 96412198 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: (103 commits)
  usbcore: remove unused argument in autosuspend
  USB: keep count of unsuspended children
  USB hub: simplify remote-wakeup handling
  USB: struct usb_device: change flag to bitflag
  OHCI: make autostop conditional on CONFIG_PM
  USB: Add autosuspend support to the hub driver
  EHCI: Fix root-hub and port suspend/resume problems
  USB: create a new thread for every USB device found during the probe sequence
  USB: add driver for the USB debug devices
  USB: added dynamic major number for USB endpoints
  USB: pegasus error path not resetting task's state
  USB: endianness fix for asix.c
  USB: build the appledisplay driver
  USB serial: replace kmalloc+memset with kzalloc
  USB: hid-core: canonical defines for Apple USB device IDs
  USB: idmouse cleanup
  USB: make drivers/usb/core/driver.c:usb_device_match() static
  USB: lh7a40x_udc remove double declaration
  USB: pxa2xx_udc recognizes ixp425 rev b0 chip
  usbtouchscreen: add support for DMC TSC-10/25 devices
  ...
parents 72a73a69 94fcda1f

Documentation/DocBook/writing_usb_driver.tmpl

+1 −2
Original line number Diff line number Diff line
@@ -345,7 +345,6 @@ static inline void skel_delete (struct usb_skel *dev) 
        usb_buffer_free (dev->udev, dev->bulk_out_size,

            dev->bulk_out_buffer,

            dev->write_urb->transfer_dma);

    if (dev->write_urb != NULL)

    usb_free_urb (dev->write_urb);

    kfree (dev);

}

drivers/char/watchdog/pcwd_usb.c

+1 −2
Original line number Diff line number Diff line
@@ -561,7 +561,6 @@ static struct notifier_block usb_pcwd_notifier = { 
 */

static inline void usb_pcwd_delete (struct usb_pcwd_private *usb_pcwd)

{

	if (usb_pcwd->intr_urb != NULL)

	usb_free_urb(usb_pcwd->intr_urb);

	if (usb_pcwd->intr_buffer != NULL)

		usb_buffer_free(usb_pcwd->udev, usb_pcwd->intr_size,

drivers/input/joystick/iforce/iforce-usb.c

+3 −3
Original line number Diff line number Diff line
@@ -178,9 +178,9 @@ static int iforce_usb_probe(struct usb_interface *intf, 


fail:

	if (iforce) {

		if (iforce->irq) usb_free_urb(iforce->irq);

		if (iforce->out) usb_free_urb(iforce->out);

		if (iforce->ctrl) usb_free_urb(iforce->ctrl);

		usb_free_urb(iforce->irq);

		usb_free_urb(iforce->out);

		usb_free_urb(iforce->ctrl);

		kfree(iforce);

	}

drivers/isdn/gigaset/usb-gigaset.c

+5 −10
Original line number Diff line number Diff line
@@ -815,13 +815,10 @@ static int gigaset_probe(struct usb_interface *interface, 
	return 0;



error:

	if (ucs->read_urb)

	usb_kill_urb(ucs->read_urb);

	kfree(ucs->bulk_out_buffer);

	if (ucs->bulk_out_urb != NULL)

	usb_free_urb(ucs->bulk_out_urb);

	kfree(cs->inbuf[0].rcvbuf);

	if (ucs->read_urb != NULL)

	usb_free_urb(ucs->read_urb);

	usb_set_intfdata(interface, NULL);

	ucs->read_urb = ucs->bulk_out_urb = NULL;
@@ -850,10 +847,8 @@ static void gigaset_disconnect(struct usb_interface *interface) 
	usb_kill_urb(ucs->bulk_out_urb);	/* FIXME: only if active? */



	kfree(ucs->bulk_out_buffer);

	if (ucs->bulk_out_urb != NULL)

	usb_free_urb(ucs->bulk_out_urb);

	kfree(cs->inbuf[0].rcvbuf);

	if (ucs->read_urb != NULL)

	usb_free_urb(ucs->read_urb);

	ucs->read_urb = ucs->bulk_out_urb = NULL;

	cs->inbuf[0].rcvbuf = ucs->bulk_out_buffer = NULL;

drivers/media/dvb/cinergyT2/cinergyT2.c

+2 −4
Original line number Diff line number Diff line
@@ -275,7 +275,6 @@ static void cinergyt2_free_stream_urbs (struct cinergyt2 *cinergyt2) 
	int i;



	for (i=0; i<STREAM_URB_COUNT; i++)

		if (cinergyt2->stream_urb[i])

		usb_free_urb(cinergyt2->stream_urb[i]);



	usb_buffer_free(cinergyt2->udev, STREAM_URB_COUNT*STREAM_BUF_SIZE,
@@ -320,7 +319,6 @@ static void cinergyt2_stop_stream_xfer (struct cinergyt2 *cinergyt2) 
	cinergyt2_control_stream_transfer(cinergyt2, 0);



	for (i=0; i<STREAM_URB_COUNT; i++)

		if (cinergyt2->stream_urb[i])

		usb_kill_urb(cinergyt2->stream_urb[i]);

}