commit 27e95c1daf2e95400c678bb4b6fd847db0249f2b
author Mike Lockwood <lockwood@android.com> Mon Jun 14 14:43:50 2010 -0700
committer Mike Lockwood <lockwood@android.com> Mon Jun 14 14:43:50 2010 -0700
tree 44014ca682362164aae7eea3c3fdb7d45fad7f4d
parent bd6e87693fe57e94d211807cfd3c763812b56012

Revert "adb: Adjust usb_linux.c for changes in libusbhost API."

This reverts commit 36b99e4cac293ae4b2400ae3fcc06b7056893060.

adb/usb_linux.c

diff --git a/adb/usb_linux.c b/adb/usb_linux.c
index 7e510df..4b5edb6 100644
--- a/adb/usb_linux.c
+++ b/adb/usb_linux.c
@@ -79,7 +79,7 @@
     return 0;
 }
 
-static void kick_disconnected_device(const char *devname, void *client_data)
+static void kick_disconnected_device(const char *devname)
 {
     usb_handle *usb;
 
@@ -202,7 +202,7 @@
     free(usb);
 }
 
-static void check_usb_device(const char *devname, void *client_data) {
+static void check_usb_device(const char *devname) {
     struct usb_device *device;
     struct usb_descriptor_iter iter;
     struct usb_descriptor_header* header;
@@ -461,7 +461,7 @@
 {
     struct sigaction    actions;
 
-    if (usb_host_init(check_usb_device, kick_disconnected_device, NULL))
+    if (usb_host_init(check_usb_device, kick_disconnected_device))
         fatal_errno("usb_host_init failed\n");
 
     memset(&actions, 0, sizeof(actions));