media: cpia2: fix control-message timeouts

commit 10729be03327f53258cb196362015ad5c6eabe02 upstream.

USB control-message timeouts are specified in milliseconds and should
specifically not vary with CONFIG_HZ.

Fixes: ab33d5071de7 ("V4L/DVB (3376): Add cpia2 camera support")
Cc: stable@vger.kernel.org      # 2.6.17
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/media/usb/cpia2/cpia2_usb.c b/drivers/media/usb/cpia2/cpia2_usb.c
index 76aac06f9fb8e2cb5b85ada5a77be10900e37dfc..cba03b286473858851310c678f047ffc772f6e8f 100644 (file)
--- a/drivers/media/usb/cpia2/cpia2_usb.c
+++ b/drivers/media/usb/cpia2/cpia2_usb.c
@@ -550,7 +550,7 @@ static int write_packet(struct usb_device *udev,
                               0,       /* index */
                               buf,     /* buffer */
                               size,
-                              HZ);
+                              1000);
 
        kfree(buf);
        return ret;
@@ -582,7 +582,7 @@ static int read_packet(struct usb_device *udev,
                               0,       /* index */
                               buf,     /* buffer */
                               size,
-                              HZ);
+                              1000);
 
        if (ret >= 0)
                memcpy(registers, buf, size);