vserver 2.0 rc7

[linux-2.6.git] / drivers / usb / input / powermate.c

diff --git a/drivers/usb/input/powermate.c b/drivers/usb/input/powermate.c
index 6e77750..7fa2f9b 100644 (file)
--- a/drivers/usb/input/powermate.c
+++ b/drivers/usb/input/powermate.c
@@ -320,7 +320,7 @@ static int powermate_probe(struct usb_interface *intf, const struct usb_device_i
        usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
                0x0a, USB_TYPE_CLASS | USB_RECIP_INTERFACE,
                0, interface->desc.bInterfaceNumber, NULL, 0,
-               HZ * USB_CTRL_SET_TIMEOUT);
+               USB_CTRL_SET_TIMEOUT);
 
        if (!(pm = kmalloc(sizeof(struct powermate_device), GFP_KERNEL)))
                return -ENOMEM;
@@ -395,6 +395,7 @@ static int powermate_probe(struct usb_interface *intf, const struct usb_device_i
        pm->input.id.version = le16_to_cpu(udev->descriptor.bcdDevice);
        pm->input.event = powermate_input_event;
        pm->input.dev = &intf->dev;
+       pm->input.phys = pm->phys;
 
        input_register_device(&pm->input);