Usb patch : interval of iso urb doesn't get initialized.
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
If you need to have
disconnect()called in all cases, feel free to get rid of usb_interface.driver ...
How about this? While I was at it, I changed some -1L's into NULL in ALSA's USB audio driver because they didn't please me :)
Duncan.
===== drivers/usb/core/devices.c 1.22 vs edited =====
drivers/usb/core/devices.c +1 -1
@@ -247,7 +247,7 @@class_decode (desc->bInterfaceClass), desc->bInterfaceSubClass, desc->bInterfaceProtocol, - iface->driver ? iface->driver->name : "(none)"); + iface->dev.driver ? iface->dev.driver->name : "(none)");unlock_kernel ();return start; }
===== drivers/usb/core/devio.c 1.55 vs edited =====
drivers/usb/core/devio.c +6 -6
@@ -691,9 +691,9 @@ interface =usb_ifnum_to_if (ps->dev, gd.interface);if (!interface)return -EINVAL ; -if (!interface->driver) +if (!interface->dev.driver)return -ENODATA ; -strcpy (gd.driver, interface->driver->name); +strncpy (gd.driver, interface->dev.driver->name,sizeof (gd.driver));if (copy_to_user (arg, &gd,sizeof (gd)))return -EFAULT ;return 0 ;
@@ -726,7 +726,7 @@continue ;err ("%s - this function is broken" , __FUNCTION__); -if (intf->driver && ps->dev) { +if (intf->dev.driver && ps->dev) {usb_probe_interface (&intf->dev); } }
@@ -747,7 +747,7 @@ interface =usb_ifnum_to_if (ps->dev, setintf.interface);if (!interface)return -EINVAL ; -if (interface->driver) { +if (interface->dev.driver) {if ((ret =checkintf (ps, ret)))return ret; }
@@ -1100,7 +1100,7 @@case USBDEVFS_DISCONNECT :/* this function is misdesigned - retained for compatibility */ lock_kernel (); - driver = ifp->driver; + driver =to_usb_driver (ifp->dev.driver);if (driver) {dbg ("disconnect '%s' from dev %d interface %d" , driver->name, ps->dev->devnum, ctrl.ifno);
@@ -1124,7 +1124,7 @@* driver module. */ lock_kernel (); - driver = ifp->driver; + driver =to_usb_driver (ifp->dev.driver);if (driver ==0 || driver->ioctl ==0 ) {unlock_kernel (); retval = -ENOSYS ;
===== drivers/usb/core/message.c 1.39 vs edited =====
drivers/usb/core/message.c +7 -0
@@ -1135,6 +1135,13 @@"registering %s (config #%d, interface %d)\n" , intf->dev.bus_id, configuration, desc->bInterfaceNumber); + } +/* Now that all interfaces are setup, any of them can be +* safely accessed from the probe() call for another +*/ +for (i =0 ; i < cp->desc.bNumInterfaces; ++i) { +struct usb_interface *intf = cp->interface[i]; +device_add (&intf->dev);usb_create_driverfs_intf_files (intf); }
===== drivers/usb/core/usb.c 1.147 vs edited =====
drivers/usb/core/usb.c +27 -28
121 lines not on this page · raw message
===== drivers/usb/net/usbnet.c 1.79 vs edited =====
drivers/usb/net/usbnet.c +6 -0
@@ -1038,6 +1038,8 @@return status; status =get_endpoints (dev, info->data);if (status <0 ) { +/* ensure immediate exit from usbnet_disconnect */ +usb_set_intfdata (info->data,NULL );usb_driver_release_interface (&usbnet_driver, info->data);return status; }
@@ -1061,12 +1063,16 @@/* disconnect master --> disconnect slave */ if (intf == info->control && info->data) { +/* ensure immediate exit from usbnet_disconnect */ +usb_set_intfdata (info->data,NULL );usb_driver_release_interface (&usbnet_driver, info->data); info->data =0 ; }/* and vice versa (just in case) */ else if (intf == info->data && info->control) { +/* ensure immediate exit from usbnet_disconnect */ +usb_set_intfdata (info->control,NULL );usb_driver_release_interface (&usbnet_driver, info->control); info->control =0 ; }
===== include/linux/usb.h 1.92 vs edited =====
include/linux/usb.h +1 -1
@@ -31,6 +31,7 @@ }struct usb_device ; +struct usb_driver ;/*-------------------------------------------------------------------------*/
@@ -118,7 +119,6 @@unsigned act_altsetting;/* active alternate setting */ unsigned num_altsetting;/* number of alternate settings */ -struct usb_driver *driver;/* driver */ int minor;/* minor number this interface is bound to */ struct device dev;/* interface specific device info */ struct class_device *class_dev;
===== sound/usb/usbaudio.c 1.49 vs edited =====
sound/usb/usbaudio.c +14 -9
@@ -2370,7 +2370,10 @@/* release interfaces */ list_for_each (p, &subs->fmt_list) { struct audioformat *fp = list_entry(p, struct audioformat, list); -usb_driver_release_interface (driver,usb_ifnum_to_if (subs->dev, fp->iface)); +struct usb_interface *intf =usb_ifnum_to_if (subs->dev, fp->iface); +/* ensure immediate exit from usb_audio_disconnect */ +usb_set_intfdata (intf,NULL ); +usb_driver_release_interface (driver, intf); } } }
@@ -2425,7 +2428,7 @@snd_printk (KERN_ERR "%d:%u:%d: cannot create sequencer device\n" , dev->devnum, ctrlif, j);continue ; } -usb_driver_claim_interface (&usb_audio_driver, iface, (void *)-1L ); +usb_driver_claim_interface (&usb_audio_driver, iface,NULL );continue ; } if ((altsd->bInterfaceClass != USB_CLASS_AUDIO &&
@@ -2437,7 +2440,7 @@ }if (!parse_audio_endpoints (chip, j)) {usb_set_interface (dev, j,0 );/* reset the current interface */ -usb_driver_claim_interface (&usb_audio_driver, iface, (void *)-1L ); +usb_driver_claim_interface (&usb_audio_driver, iface,NULL ); } }
@@ -2535,7 +2538,7 @@if (err <0 )return err;if (quirk->ifnum != probed_ifnum) -usb_driver_claim_interface (&usb_audio_driver, iface, (void *)-1L ); +usb_driver_claim_interface (&usb_audio_driver, iface,NULL ); }return 0 ; }
@@ -2833,9 +2836,6 @@snd_card_t *card;struct list_head *p; -if (ptr == (void *)-1L ) -return ; - chip =snd_magic_cast (snd_usb_audio_t, ptr, return); card = chip->card;down (®ister_mutex);
@@ -2875,8 +2875,13 @@static void usb_audio_disconnect (struct usb_interface *intf) { -snd_usb_audio_disconnect (interface_to_usbdev (intf), -dev_get_drvdata (&intf->dev)); +void *data =usb_get_intfdata (intf); + +if (!data) +return ; + +usb_set_intfdata (intf,NULL ); +snd_usb_audio_disconnect (interface_to_usbdev (intf), data); }
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials. Become an expert in LINUX or just sharpen your skills. Sign up for IBM's Free Linux Tutorials. Learn everything from the bash shell to sys admin. Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
[email protected]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel