1 files changed, 115 insertions, 133 deletions

diff --git a/drivers/usb/input/ati_remote.c b/drivers/usb/input/ati_remote.c
index 860df26323b1..654ac454744d 100644
--- a/drivers/usb/input/ati_remote.c
+++ b/drivers/usb/input/ati_remote.c
@@ -1,15 +1,15 @@
-/* 
+/*
  *  USB ATI Remote support
  *
  *  Version 2.2.0 Copyright (c) 2004 Torrey Hoffman <thoffman@arnor.net>
  *  Version 2.1.1 Copyright (c) 2002 Vladimir Dergachev
  *
  *  This 2.2.0 version is a rewrite / cleanup of the 2.1.1 driver, including
- *  porting to the 2.6 kernel interfaces, along with other modification 
+ *  porting to the 2.6 kernel interfaces, along with other modification
  *  to better match the style of the existing usb/input drivers.  However, the
  *  protocol and hardware handling is essentially unchanged from 2.1.1.
- *  
- *  The 2.1.1 driver was derived from the usbati_remote and usbkbd drivers by 
+ *
+ *  The 2.1.1 driver was derived from the usbati_remote and usbkbd drivers by
  *  Vojtech Pavlik.
  *
  *  Changes:
@@ -23,64 +23,64 @@
  *            Added support for the "Lola" remote contributed by:
  *                Seth Cohn <sethcohn@yahoo.com>
  *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or 
+ * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * 
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  * Hardware & software notes
  *
- * These remote controls are distributed by ATI as part of their 
- * "All-In-Wonder" video card packages.  The receiver self-identifies as a 
+ * These remote controls are distributed by ATI as part of their
+ * "All-In-Wonder" video card packages.  The receiver self-identifies as a
  * "USB Receiver" with manufacturer "X10 Wireless Technology Inc".
  *
- * The "Lola" remote is available from X10.  See: 
+ * The "Lola" remote is available from X10.  See:
  *    http://www.x10.com/products/lola_sg1.htm
  * The Lola is similar to the ATI remote but has no mouse support, and slightly
  * different keys.
  *
- * It is possible to use multiple receivers and remotes on multiple computers 
+ * It is possible to use multiple receivers and remotes on multiple computers
  * simultaneously by configuring them to use specific channels.
- * 
- * The RF protocol used by the remote supports 16 distinct channels, 1 to 16.  
- * Actually, it may even support more, at least in some revisions of the 
+ *
+ * The RF protocol used by the remote supports 16 distinct channels, 1 to 16.
+ * Actually, it may even support more, at least in some revisions of the
  * hardware.
  *
  * Each remote can be configured to transmit on one channel as follows:
- *   - Press and hold the "hand icon" button.  
- *   - When the red LED starts to blink, let go of the "hand icon" button. 
- *   - When it stops blinking, input the channel code as two digits, from 01 
+ *   - Press and hold the "hand icon" button.
+ *   - When the red LED starts to blink, let go of the "hand icon" button.
+ *   - When it stops blinking, input the channel code as two digits, from 01
  *     to 16, and press the hand icon again.
- * 
+ *
  * The timing can be a little tricky.  Try loading the module with debug=1
  * to have the kernel print out messages about the remote control number
  * and mask.  Note: debugging prints remote numbers as zero-based hexadecimal.
  *
  * The driver has a "channel_mask" parameter. This bitmask specifies which
- * channels will be ignored by the module.  To mask out channels, just add 
+ * channels will be ignored by the module.  To mask out channels, just add
  * all the 2^channel_number values together.
  *
  * For instance, set channel_mask = 2^4 = 16 (binary 10000) to make ati_remote
- * ignore signals coming from remote controls transmitting on channel 4, but 
+ * ignore signals coming from remote controls transmitting on channel 4, but
  * accept all other channels.
  *
- * Or, set channel_mask = 65533, (0xFFFD), and all channels except 1 will be 
+ * Or, set channel_mask = 65533, (0xFFFD), and all channels except 1 will be
  * ignored.
  *
- * The default is 0 (respond to all channels). Bit 0 and bits 17-32 of this 
+ * The default is 0 (respond to all channels). Bit 0 and bits 17-32 of this
  * parameter are unused.
  *
  */
@@ -99,13 +99,13 @@
 /*
  * Module and Version Information, Module Parameters
  */
- 
-#define ATI_REMOTE_VENDOR_ID    0x0bc7
-#define ATI_REMOTE_PRODUCT_ID   0x004
-#define LOLA_REMOTE_PRODUCT_ID  0x002
+
+#define ATI_REMOTE_VENDOR_ID    0x0bc7
+#define ATI_REMOTE_PRODUCT_ID   0x004
+#define LOLA_REMOTE_PRODUCT_ID  0x002
 #define MEDION_REMOTE_PRODUCT_ID 0x006
 
-#define DRIVER_VERSION          "2.2.1"
+#define DRIVER_VERSION          "2.2.1"
 #define DRIVER_AUTHOR           "Torrey Hoffman <thoffman@arnor.net>"
 #define DRIVER_DESC             "ATI/X10 RF USB Remote Control"
 
@@ -113,18 +113,18 @@
 #define DATA_BUFSIZE      63    /* size of URB data buffers */
 #define ATI_INPUTNUM      1     /* Which input device to register as */
 
-static unsigned long channel_mask = 0;
+static unsigned long channel_mask;
 module_param(channel_mask, ulong, 0444);
 MODULE_PARM_DESC(channel_mask, "Bitmask of remote control channels to ignore");
 
-static int debug = 0;
+static int debug;
 module_param(debug, int, 0444);
 MODULE_PARM_DESC(debug, "Enable extra debug messages and information");
 
 #define dbginfo(dev, format, arg...) do { if (debug) dev_info(dev , format , ## arg); } while (0)
 #undef err
 #define err(format, arg...) printk(KERN_ERR format , ## arg)
- 
+
 static struct usb_device_id ati_remote_table[] = {
         { USB_DEVICE(ATI_REMOTE_VENDOR_ID, ATI_REMOTE_PRODUCT_ID) },
         { USB_DEVICE(ATI_REMOTE_VENDOR_ID, LOLA_REMOTE_PRODUCT_ID) },
@@ -148,7 +148,7 @@ static char init2[] = { 0x01, 0x00, 0x20, 0x14, 0x20, 0x20, 0x20 };
 /* Acceleration curve for directional control pad */
 static char accel[] = { 1, 2, 4, 6, 9, 13, 20 };
 
-/* Duplicate event filtering time. 
+/* Duplicate event filtering time.
  * Sequential, identical KIND_FILTERED inputs with less than
  * FILTER_TIME jiffies between them are considered as repeat
  * events. The hardware generates 5 events for the first keypress
@@ -161,10 +161,10 @@ static char accel[] = { 1, 2, 4, 6, 9, 13, 20 };
 static DECLARE_MUTEX(disconnect_sem);
 
 struct ati_remote {
-        struct input_dev idev;          
+        struct input_dev idev;
         struct usb_device *udev;
         struct usb_interface *interface;
-                
+
         struct urb *irq_urb;
         struct urb *out_urb;
         struct usb_endpoint_descriptor *endpoint_in;
@@ -174,13 +174,11 @@ struct ati_remote {
         dma_addr_t inbuf_dma;
         dma_addr_t outbuf_dma;
 
-        int open;                   /* open counter */
-        
         unsigned char old_data[2];  /* Detect duplicate events */
         unsigned long old_jiffies;
         unsigned long acc_jiffies;  /* handle acceleration */
         unsigned int repeat_count;
-        
+
         char name[NAME_BUFSIZE];
         char phys[NAME_BUFSIZE];
 
@@ -206,14 +204,14 @@ static struct
         int type;
         unsigned int code;
         int value;
-}  ati_remote_tbl[] = 
+}  ati_remote_tbl[] =
 {
         /* Directional control pad axes */
         {KIND_ACCEL,   0x35, 0x70, EV_REL, REL_X, -1},   /* left */
         {KIND_ACCEL,   0x36, 0x71, EV_REL, REL_X, 1},    /* right */
         {KIND_ACCEL,   0x37, 0x72, EV_REL, REL_Y, -1},   /* up */
         {KIND_ACCEL,   0x38, 0x73, EV_REL, REL_Y, 1},    /* down */
-        /* Directional control pad diagonals */ 
+        /* Directional control pad diagonals */
         {KIND_LU,      0x39, 0x74, EV_REL, 0, 0},        /* left up */
         {KIND_RU,      0x3a, 0x75, EV_REL, 0, 0},        /* right up */
         {KIND_LD,      0x3c, 0x77, EV_REL, 0, 0},        /* left down */
@@ -225,7 +223,7 @@ static struct
         {KIND_LITERAL, 0x41, 0x7c, EV_KEY, BTN_RIGHT, 1},/* right btn down */
         {KIND_LITERAL, 0x42, 0x7d, EV_KEY, BTN_RIGHT, 0},/* right btn up */
 
-        /* Artificial "doubleclick" events are generated by the hardware. 
+        /* Artificial "doubleclick" events are generated by the hardware.
          * They are mapped to the "side" and "extra" mouse buttons here. */
         {KIND_FILTERED, 0x3f, 0x7a, EV_KEY, BTN_SIDE, 1}, /* left dblclick */
         {KIND_FILTERED, 0x43, 0x7e, EV_KEY, BTN_EXTRA, 1},/* right dblclick */
@@ -273,15 +271,15 @@ static struct
         {KIND_FILTERED, 0xea, 0x25, EV_KEY, KEY_PLAY, 1},       /* ( >) */
         {KIND_FILTERED, 0xe9, 0x24, EV_KEY, KEY_REWIND, 1},     /* (<<) */
         {KIND_FILTERED, 0xeb, 0x26, EV_KEY, KEY_FORWARD, 1},    /* (>>) */
-        {KIND_FILTERED, 0xed, 0x28, EV_KEY, KEY_STOP, 1},       /* ([]) */ 
+        {KIND_FILTERED, 0xed, 0x28, EV_KEY, KEY_STOP, 1},       /* ([]) */
         {KIND_FILTERED, 0xee, 0x29, EV_KEY, KEY_PAUSE, 1},      /* ('') */
         {KIND_FILTERED, 0xf0, 0x2b, EV_KEY, KEY_PREVIOUS, 1},   /* (<-) */
         {KIND_FILTERED, 0xef, 0x2a, EV_KEY, KEY_NEXT, 1},       /* (>+) */
         {KIND_FILTERED, 0xf2, 0x2D, EV_KEY, KEY_INFO, 1},       /* PLAYING */
         {KIND_FILTERED, 0xf3, 0x2E, EV_KEY, KEY_HOME, 1},       /* TOP */
         {KIND_FILTERED, 0xf4, 0x2F, EV_KEY, KEY_END, 1},        /* END */
-        {KIND_FILTERED, 0xf5, 0x30, EV_KEY, KEY_SELECT, 1},     /* SELECT */    
-        
+        {KIND_FILTERED, 0xf5, 0x30, EV_KEY, KEY_SELECT, 1},     /* SELECT */
+
         {KIND_END, 0x00, 0x00, EV_MAX + 1, 0, 0}
 };
 
@@ -315,7 +313,7 @@ static void ati_remote_dump(unsigned char *data, unsigned int len)
         if ((len == 1) && (data[0] != (unsigned char)0xff) && (data[0] != 0x00))
                 warn("Weird byte 0x%02x", data[0]);
         else if (len == 4)
-                warn("Weird key %02x %02x %02x %02x", 
+                warn("Weird key %02x %02x %02x %02x",
                      data[0], data[1], data[2], data[3]);
         else
                 warn("Weird data, len=%d %02x %02x %02x %02x %02x %02x ...",
@@ -328,25 +326,16 @@ static void ati_remote_dump(unsigned char *data, unsigned int len)
 static int ati_remote_open(struct input_dev *inputdev)
 {
         struct ati_remote *ati_remote = inputdev->private;
-        int retval = 0;
-
-        down(&disconnect_sem);
-
-        if (ati_remote->open++)
-                goto exit;
 
         /* On first open, submit the read urb which was set up previously. */
         ati_remote->irq_urb->dev = ati_remote->udev;
         if (usb_submit_urb(ati_remote->irq_urb, GFP_KERNEL)) {
-                dev_err(&ati_remote->interface->dev, 
+                dev_err(&ati_remote->interface->dev,
                         "%s: usb_submit_urb failed!\n", __FUNCTION__);
-                ati_remote->open--;
-                retval = -EIO;
+                return -EIO;
         }
 
-exit:
-        up(&disconnect_sem);
-        return retval;
+        return 0;
 }
 
 /*
@@ -355,9 +344,8 @@ exit:
 static void ati_remote_close(struct input_dev *inputdev)
 {
         struct ati_remote *ati_remote = inputdev->private;
-        
-        if (!--ati_remote->open)
-                usb_kill_urb(ati_remote->irq_urb);
+
+        usb_kill_urb(ati_remote->irq_urb);
 }
 
 /*
@@ -366,13 +354,13 @@ static void ati_remote_close(struct input_dev *inputdev)
 static void ati_remote_irq_out(struct urb *urb, struct pt_regs *regs)
 {
         struct ati_remote *ati_remote = urb->context;
-        
+
         if (urb->status) {
                 dev_dbg(&ati_remote->interface->dev, "%s: status %d\n",
                         __FUNCTION__, urb->status);
                 return;
         }
-        
+
         ati_remote->send_flags |= SEND_FLAG_COMPLETE;
         wmb();
         wake_up(&ati_remote->wait);
@@ -380,16 +368,16 @@ static void ati_remote_irq_out(struct urb *urb, struct pt_regs *regs)
 
 /*
  *      ati_remote_sendpacket
- *              
+ *
  *      Used to send device initialization strings
  */
 static int ati_remote_sendpacket(struct ati_remote *ati_remote, u16 cmd, unsigned char *data)
 {
         int retval = 0;
-        
+
         /* Set up out_urb */
         memcpy(ati_remote->out_urb->transfer_buffer + 1, data, LO(cmd));
-        ((char *) ati_remote->out_urb->transfer_buffer)[0] = HI(cmd);   
+        ((char *) ati_remote->out_urb->transfer_buffer)[0] = HI(cmd);
 
         ati_remote->out_urb->transfer_buffer_length = LO(cmd) + 1;
         ati_remote->out_urb->dev = ati_remote->udev;
@@ -397,17 +385,17 @@ static int ati_remote_sendpacket(struct ati_remote *ati_remote, u16 cmd, unsigne
 
         retval = usb_submit_urb(ati_remote->out_urb, GFP_ATOMIC);
         if (retval) {
-                dev_dbg(&ati_remote->interface->dev, 
+                dev_dbg(&ati_remote->interface->dev,
                          "sendpacket: usb_submit_urb failed: %d\n", retval);
                 return retval;
         }
 
         wait_event_timeout(ati_remote->wait,
                 ((ati_remote->out_urb->status != -EINPROGRESS) ||
-                        (ati_remote->send_flags & SEND_FLAG_COMPLETE)),
+                        (ati_remote->send_flags & SEND_FLAG_COMPLETE)),
                 HZ);
         usb_kill_urb(ati_remote->out_urb);
-        
+
         return retval;
 }
 
@@ -419,15 +407,15 @@ static int ati_remote_event_lookup(int rem, unsigned char d1, unsigned char d2)
         int i;
 
         for (i = 0; ati_remote_tbl[i].kind != KIND_END; i++) {
-                /* 
-                 * Decide if the table entry matches the remote input. 
+                /*
+                 * Decide if the table entry matches the remote input.
                  */
                 if ((((ati_remote_tbl[i].data1 & 0x0f) == (d1 & 0x0f))) &&
-                    ((((ati_remote_tbl[i].data1 >> 4) - 
-                       (d1 >> 4) + rem) & 0x0f) == 0x0f) && 
+                    ((((ati_remote_tbl[i].data1 >> 4) -
+                       (d1 >> 4) + rem) & 0x0f) == 0x0f) &&
                     (ati_remote_tbl[i].data2 == d2))
                         return i;
-                
+
         }
         return -1;
 }
@@ -435,16 +423,16 @@ static int ati_remote_event_lookup(int rem, unsigned char d1, unsigned char d2)
 /*
  *      ati_remote_report_input
  */
-static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs)      
+static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs)
 {
         struct ati_remote *ati_remote = urb->context;
         unsigned char *data= ati_remote->inbuf;
-        struct input_dev *dev = &ati_remote->idev; 
+        struct input_dev *dev = &ati_remote->idev;
         int index, acc;
         int remote_num;
-        
+
         /* Deal with strange looking inputs */
-        if ( (urb->actual_length != 4) || (data[0] != 0x14) || 
+        if ( (urb->actual_length != 4) || (data[0] != 0x14) ||
                 ((data[3] & 0x0f) != 0x00) ) {
                 ati_remote_dump(data, urb->actual_length);
                 return;
@@ -453,7 +441,7 @@ static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs)
         /* Mask unwanted remote channels.  */
         /* note: remote_num is 0-based, channel 1 on remote == 0 here */
         remote_num = (data[3] >> 4) & 0x0f;
-        if (channel_mask & (1 << (remote_num + 1))) { 
+        if (channel_mask & (1 << (remote_num + 1))) {
                 dbginfo(&ati_remote->interface->dev,
                         "Masked input from channel 0x%02x: data %02x,%02x, mask= 0x%02lx\n",
                         remote_num, data[1], data[2], channel_mask);
@@ -463,37 +451,36 @@ static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs)
         /* Look up event code index in translation table */
         index = ati_remote_event_lookup(remote_num, data[1], data[2]);
         if (index < 0) {
-                dev_warn(&ati_remote->interface->dev, 
-                         "Unknown input from channel 0x%02x: data %02x,%02x\n", 
+                dev_warn(&ati_remote->interface->dev,
+                         "Unknown input from channel 0x%02x: data %02x,%02x\n",
                          remote_num, data[1], data[2]);
                 return;
-        } 
-        dbginfo(&ati_remote->interface->dev, 
+        }
+        dbginfo(&ati_remote->interface->dev,
                 "channel 0x%02x; data %02x,%02x; index %d; keycode %d\n",
                 remote_num, data[1], data[2], index, ati_remote_tbl[index].code);
-        
+
         if (ati_remote_tbl[index].kind == KIND_LITERAL) {
                 input_regs(dev, regs);
                 input_event(dev, ati_remote_tbl[index].type,
                         ati_remote_tbl[index].code,
                         ati_remote_tbl[index].value);
                 input_sync(dev);
-                
+
                 ati_remote->old_jiffies = jiffies;
                 return;
         }
-        
+
         if (ati_remote_tbl[index].kind == KIND_FILTERED) {
                 /* Filter duplicate events which happen "too close" together. */
-                if ((ati_remote->old_data[0] == data[1]) && 
-                        (ati_remote->old_data[1] == data[2]) && 
-                        ((ati_remote->old_jiffies + FILTER_TIME) > jiffies)) {
+                if ((ati_remote->old_data[0] == data[1]) &&
+                        (ati_remote->old_data[1] == data[2]) &&
+                        ((ati_remote->old_jiffies + FILTER_TIME) > jiffies)) {
                         ati_remote->repeat_count++;
-                } 
-                else {
+                } else {
                         ati_remote->repeat_count = 0;
                 }
-                
+
                 ati_remote->old_data[0] = data[1];
                 ati_remote->old_data[1] = data[2];
                 ati_remote->old_jiffies = jiffies;
@@ -501,7 +488,7 @@ static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs)
                 if ((ati_remote->repeat_count > 0)
                     && (ati_remote->repeat_count < 5))
                         return;
-                
+
 
                 input_regs(dev, regs);
                 input_event(dev, ati_remote_tbl[index].type,
@@ -511,13 +498,13 @@ static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs)
                 input_sync(dev);
 
                 return;
-        }                       
-        
-        /* 
+        }
+
+        /*
          * Other event kinds are from the directional control pad, and have an
          * acceleration factor applied to them.  Without this acceleration, the
          * control pad is mostly unusable.
-         * 
+         *
          * If elapsed time since last event is > 1/4 second, user "stopped",
          * so reset acceleration. Otherwise, user is probably holding the control
          * pad down, so we increase acceleration, ramping up over two seconds to
@@ -559,7 +546,7 @@ static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs)
                 input_report_rel(dev, REL_Y, acc);
                 break;
         default:
-                dev_dbg(&ati_remote->interface->dev, "ati_remote kind=%d\n", 
+                dev_dbg(&ati_remote->interface->dev, "ati_remote kind=%d\n",
                         ati_remote_tbl[index].kind);
         }
         input_sync(dev);
@@ -586,12 +573,12 @@ static void ati_remote_irq_in(struct urb *urb, struct pt_regs *regs)
         case -ESHUTDOWN:
                 dev_dbg(&ati_remote->interface->dev, "%s: urb error status, unlink? \n",
                         __FUNCTION__);
-                return; 
+                return;
         default:                /* error */
-                dev_dbg(&ati_remote->interface->dev, "%s: Nonzero urb status %d\n", 
+                dev_dbg(&ati_remote->interface->dev, "%s: Nonzero urb status %d\n",
                         __FUNCTION__, urb->status);
         }
-        
+
         retval = usb_submit_urb(urb, SLAB_ATOMIC);
         if (retval)
                 dev_err(&ati_remote->interface->dev, "%s: usb_submit_urb()=%d\n",
@@ -603,8 +590,6 @@ static void ati_remote_irq_in(struct urb *urb, struct pt_regs *regs)
  */
 static void ati_remote_delete(struct ati_remote *ati_remote)
 {
-        if (!ati_remote) return;
-
         if (ati_remote->irq_urb)
                 usb_kill_urb(ati_remote->irq_urb);
 
@@ -614,16 +599,16 @@ static void ati_remote_delete(struct ati_remote *ati_remote)
         input_unregister_device(&ati_remote->idev);
 
         if (ati_remote->inbuf)
-                usb_buffer_free(ati_remote->udev, DATA_BUFSIZE, 
+                usb_buffer_free(ati_remote->udev, DATA_BUFSIZE,
                                 ati_remote->inbuf, ati_remote->inbuf_dma);
-                
+
         if (ati_remote->outbuf)
-                usb_buffer_free(ati_remote->udev, DATA_BUFSIZE, 
+                usb_buffer_free(ati_remote->udev, DATA_BUFSIZE,
                                 ati_remote->outbuf, ati_remote->outbuf_dma);
-        
+
         if (ati_remote->irq_urb)
                 usb_free_urb(ati_remote->irq_urb);
-        
+
         if (ati_remote->out_urb)
                 usb_free_urb(ati_remote->out_urb);
 
@@ -636,51 +621,52 @@ static void ati_remote_input_init(struct ati_remote *ati_remote)
         int i;
 
         idev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        idev->keybit[LONG(BTN_MOUSE)] = ( BIT(BTN_LEFT) | BIT(BTN_RIGHT) | 
+        idev->keybit[LONG(BTN_MOUSE)] = ( BIT(BTN_LEFT) | BIT(BTN_RIGHT) |
                                           BIT(BTN_SIDE) | BIT(BTN_EXTRA) );
         idev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
         for (i = 0; ati_remote_tbl[i].kind != KIND_END; i++)
                 if (ati_remote_tbl[i].type == EV_KEY)
                         set_bit(ati_remote_tbl[i].code, idev->keybit);
-        
+
         idev->private = ati_remote;
         idev->open = ati_remote_open;
         idev->close = ati_remote_close;
-        
+
         idev->name = ati_remote->name;
         idev->phys = ati_remote->phys;
-        
-        idev->id.bustype = BUS_USB;             
+
+        idev->id.bustype = BUS_USB;
         idev->id.vendor = le16_to_cpu(ati_remote->udev->descriptor.idVendor);
         idev->id.product = le16_to_cpu(ati_remote->udev->descriptor.idProduct);
         idev->id.version = le16_to_cpu(ati_remote->udev->descriptor.bcdDevice);
+        idev->dev = &(ati_remote->udev->dev);
 }
 
 static int ati_remote_initialize(struct ati_remote *ati_remote)
 {
         struct usb_device *udev = ati_remote->udev;
         int pipe, maxp;
-                
+
         init_waitqueue_head(&ati_remote->wait);
 
         /* Set up irq_urb */
         pipe = usb_rcvintpipe(udev, ati_remote->endpoint_in->bEndpointAddress);
         maxp = usb_maxpacket(udev, pipe, usb_pipeout(pipe));
         maxp = (maxp > DATA_BUFSIZE) ? DATA_BUFSIZE : maxp;
-        
-        usb_fill_int_urb(ati_remote->irq_urb, udev, pipe, ati_remote->inbuf, 
-                         maxp, ati_remote_irq_in, ati_remote, 
+
+        usb_fill_int_urb(ati_remote->irq_urb, udev, pipe, ati_remote->inbuf,
+                         maxp, ati_remote_irq_in, ati_remote,
                          ati_remote->endpoint_in->bInterval);
         ati_remote->irq_urb->transfer_dma = ati_remote->inbuf_dma;
         ati_remote->irq_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
-        
+
         /* Set up out_urb */
         pipe = usb_sndintpipe(udev, ati_remote->endpoint_out->bEndpointAddress);
         maxp = usb_maxpacket(udev, pipe, usb_pipeout(pipe));
         maxp = (maxp > DATA_BUFSIZE) ? DATA_BUFSIZE : maxp;
 
-        usb_fill_int_urb(ati_remote->out_urb, udev, pipe, ati_remote->outbuf, 
-                         maxp, ati_remote_irq_out, ati_remote, 
+        usb_fill_int_urb(ati_remote->out_urb, udev, pipe, ati_remote->outbuf,
+                         maxp, ati_remote_irq_out, ati_remote,
                          ati_remote->endpoint_out->bInterval);
         ati_remote->out_urb->transfer_dma = ati_remote->outbuf_dma;
         ati_remote->out_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
@@ -688,11 +674,11 @@ static int ati_remote_initialize(struct ati_remote *ati_remote)
         /* send initialization strings */
         if ((ati_remote_sendpacket(ati_remote, 0x8004, init1)) ||
             (ati_remote_sendpacket(ati_remote, 0x8007, init2))) {
-                dev_err(&ati_remote->interface->dev, 
+                dev_err(&ati_remote->interface->dev,
                          "Initializing ati_remote hardware failed.\n");
                 return 1;
         }
-        
+
         return 0;
 }
 
@@ -769,7 +755,7 @@ static int ati_remote_probe(struct usb_interface *interface, const struct usb_de
 
         if (!strlen(ati_remote->name))
                 sprintf(ati_remote->name, DRIVER_DESC "(%04x,%04x)",
-                        le16_to_cpu(ati_remote->udev->descriptor.idVendor), 
+                        le16_to_cpu(ati_remote->udev->descriptor.idVendor),
                         le16_to_cpu(ati_remote->udev->descriptor.idProduct));
 
         /* Device Hardware Initialization - fills in ati_remote->idev from udev. */
@@ -781,11 +767,11 @@ static int ati_remote_probe(struct usb_interface *interface, const struct usb_de
         ati_remote_input_init(ati_remote);
         input_register_device(&ati_remote->idev);
 
-        dev_info(&ati_remote->interface->dev, "Input registered: %s on %s\n", 
+        dev_info(&ati_remote->interface->dev, "Input registered: %s on %s\n",
                  ati_remote->name, path);
 
         usb_set_intfdata(interface, ati_remote);
-        
+
 error:
         if (retval)
                 ati_remote_delete(ati_remote);
@@ -800,18 +786,14 @@ static void ati_remote_disconnect(struct usb_interface *interface)
 {
         struct ati_remote *ati_remote;
 
-        down(&disconnect_sem);
-
         ati_remote = usb_get_intfdata(interface);
         usb_set_intfdata(interface, NULL);
         if (!ati_remote) {
                 warn("%s - null device?\n", __FUNCTION__);
                 return;
         }
-        
-        ati_remote_delete(ati_remote);
 
-        up(&disconnect_sem);
+        ati_remote_delete(ati_remote);
 }
 
 /*
@@ -820,7 +802,7 @@ static void ati_remote_disconnect(struct usb_interface *interface)
 static int __init ati_remote_init(void)
 {
         int result;
-        
+
         result = usb_register(&ati_remote_driver);
         if (result)
                 err("usb_register error #%d\n", result);
@@ -838,8 +820,8 @@ static void __exit ati_remote_exit(void)
         usb_deregister(&ati_remote_driver);
 }
 
-/* 
- *      module specification 
+/*
+ *      module specification
  */
 
 module_init(ati_remote_init);