usbatm usbatm.c,1.15,1.16 usbatm.h,1.10,1.11

[kagan at infradead.org]

Update of /home/cvs/usbatm
In directory phoenix.infradead.org:/tmp/cvs-serv9628

Modified Files:
	usbatm.c usbatm.h 
Log Message:
Pass usb_device_id pointer from usbatm_usb_probe down to subdriver's ->bind()

Index: usbatm.c
===================================================================
RCS file: /home/cvs/usbatm/usbatm.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- usbatm.c	4 Mar 2005 11:30:58 -0000	1.15
+++ usbatm.c	1 Apr 2005 10:16:22 -0000	1.16
@@ -1091,7 +1091,7 @@
 
  bind:
 	need_heavy = 1;
-	if (driver->bind && (error = driver->bind(instance, intf, &need_heavy)) < 0) {
+	if (driver->bind && (error = driver->bind(instance, intf, id, &need_heavy)) < 0) {
 			dev_dbg(&intf->dev, "bind failed: %d!\n", error);
 			goto fail_free;
 	}

Index: usbatm.h
===================================================================
RCS file: /home/cvs/usbatm/usbatm.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- usbatm.h	7 Feb 2005 23:50:41 -0000	1.10
+++ usbatm.h	1 Apr 2005 10:16:22 -0000	1.11
@@ -69,7 +69,8 @@
 	*  init device ... can sleep, or cause probe() failure.  Drivers with a heavy_init
 	*  method can avoid the call to heavy_init by setting need_heavy_init to zero.
 	*/
-        int (*bind) (struct usbatm_data *, struct usb_interface *, int *need_heavy_init);
+        int (*bind) (struct usbatm_data *, struct usb_interface *,
+		     const struct usb_device_id *id, int *need_heavy_init);
 
 	/* additional device initialization that is too slow to be done in probe() */
         int (*heavy_init) (struct usbatm_data *, struct usb_interface *);