Auto merge with /home/aegl/GIT/linus

[linux-2.6] / drivers / usb / input / ati_remote.c

diff --git a/drivers/usb/input/ati_remote.c b/drivers/usb/input/ati_remote.c
index 355add5c29f57edb4caf030bd390e2b07f9790ec..860df26323b163ede689f4b259ff9dcef19e405c 100644 (file)
--- a/drivers/usb/input/ati_remote.c
+++ b/drivers/usb/input/ati_remote.c
@@ -619,7 +619,7 @@ static void ati_remote_delete(struct ati_remote *ati_remote)
                
        if (ati_remote->outbuf)
                usb_buffer_free(ati_remote->udev, DATA_BUFSIZE, 
-                               ati_remote->inbuf, ati_remote->outbuf_dma);
+                               ati_remote->outbuf, ati_remote->outbuf_dma);
        
        if (ati_remote->irq_urb)
                usb_free_urb(ati_remote->irq_urb);