The patch number 9856 was added via Jean-Francois Moine <moin...@free.fr>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
v4l-dvb-maintai...@linuxtv.org
------
From: Antonio Ospite <osp...@studenti.unina.it>
gspca: Use u8 values for USB control messages in ov534.
Priority: normal
Signed-off-by: Antonio Ospite <osp...@studenti.unina.it>
Signed-off-by: Jean-Francois Moine <moin...@free.fr>
---
linux/drivers/media/video/gspca/ov534.c | 36 ++++++++++++------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff -r 6b88affc786a -r d23374509b5b linux/drivers/media/video/gspca/ov534.c
--- a/linux/drivers/media/video/gspca/ov534.c Wed Dec 03 18:01:54 2008 +0100
+++ b/linux/drivers/media/video/gspca/ov534.c Wed Dec 03 18:10:01 2008 +0100
@@ -62,12 +62,12 @@ static struct v4l2_pix_format vga_mode[]
.priv = 0},
};
-static void ov534_reg_write(struct usb_device *udev, u16 reg, u16 val)
-{
- u16 data = val;
+static void ov534_reg_write(struct usb_device *udev, u16 reg, u8 val)
+{
+ u8 data = val;
int ret;
- PDEBUG(D_USBO, "reg=0x%04x, val=0%04x", reg, val);
+ PDEBUG(D_USBO, "reg=0x%04x, val=0%02x", reg, val);
ret = usb_control_msg(udev,
usb_sndctrlpipe(udev, 0),
0x1,
@@ -77,9 +77,9 @@ static void ov534_reg_write(struct usb_d
PDEBUG(D_ERR, "write failed");
}
-static u16 ov534_reg_read(struct usb_device *udev, u16 reg)
-{
- u16 data;
+static u8 ov534_reg_read(struct usb_device *udev, u16 reg)
+{
+ u8 data;
int ret;
ret = usb_control_msg(udev,
@@ -87,21 +87,21 @@ static u16 ov534_reg_read(struct usb_dev
0x1,
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
0x0, reg, &data, 1, CTRL_TIMEOUT);
- PDEBUG(D_USBI, "reg=0x%04x, data=0x%04x", reg, data);
+ PDEBUG(D_USBI, "reg=0x%04x, data=0x%02x", reg, data);
if (ret < 0)
PDEBUG(D_ERR, "read failed");
return data;
}
-static void ov534_reg_verify_write(struct usb_device *udev, u16 reg, u16 val)
-{
- u16 data;
+static void ov534_reg_verify_write(struct usb_device *udev, u16 reg, u8 val)
+{
+ u8 data;
ov534_reg_write(udev, reg, val);
data = ov534_reg_read(udev, reg);
if (data != val) {
PDEBUG(D_ERR | D_USBO,
- "unexpected result from read: 0x%04x != 0x%04x", val,
+ "unexpected result from read: 0x%02x != 0x%02x", val,
data);
}
}
@@ -110,7 +110,7 @@ static void ov534_reg_verify_write(struc
* (direction and output)? */
static void ov534_set_led(struct usb_device *udev, int status)
{
- u16 data;
+ u8 data;
PDEBUG(D_CONF, "led status: %d", status);
@@ -129,13 +129,13 @@ static void ov534_set_led(struct usb_dev
static int sccb_check_status(struct usb_device *udev)
{
- u16 data;
+ u8 data;
int i;
for (i = 0; i < 5; i++) {
data = ov534_reg_read(udev, OV534_REG_STATUS);
- switch (data & 0xFF) {
+ switch (data) {
case 0x00:
return 1;
case 0x04:
@@ -150,9 +150,9 @@ static int sccb_check_status(struct usb_
return 0;
}
-static void sccb_reg_write(struct usb_device *udev, u16 reg, u16 val)
-{
- PDEBUG(D_USBO, "reg: 0x%04x, val: 0x%04x", reg, val);
+static void sccb_reg_write(struct usb_device *udev, u16 reg, u8 val)
+{
+ PDEBUG(D_USBO, "reg: 0x%04x, val: 0x%02x", reg, val);
ov534_reg_write(udev, OV534_REG_SUBADDR, reg);
ov534_reg_write(udev, OV534_REG_WRITE, val);
ov534_reg_write(udev, OV534_REG_OPERATION, OV534_OP_WRITE_3);
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/d23374509b5b1b24d813bcf3f2007cbee131c1a3
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
