Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 232211
b: refs/heads/master
c: ddffa49
h: refs/heads/master
i:
  232209: c35d0cd
  232207: 35ca21c
v: v3
  • Loading branch information
Jean-François Moine authored and Mauro Carvalho Chehab committed Jan 19, 2011
1 parent e6545d2 commit 5c26b52
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fc63de88e0f27ecdaab4d2d836fd7bacab643fc0
refs/heads/master: ddffa49e257e2b28e23f1e2729c0560bcad89937
6 changes: 3 additions & 3 deletions trunk/drivers/media/video/gspca/ov534.c
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ static void ov534_reg_write(struct gspca_dev *gspca_dev, u16 reg, u8 val)
struct usb_device *udev = gspca_dev->dev;
int ret;

PDEBUG(D_USBO, "reg=0x%04x, val=0%02x", reg, val);
PDEBUG(D_USBO, "SET 01 0000 %04x %02x", reg, val);
gspca_dev->usb_buf[0] = val;
ret = usb_control_msg(udev,
usb_sndctrlpipe(udev, 0),
Expand All @@ -500,7 +500,7 @@ static u8 ov534_reg_read(struct gspca_dev *gspca_dev, u16 reg)
0x01,
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
0x00, reg, gspca_dev->usb_buf, 1, CTRL_TIMEOUT);
PDEBUG(D_USBI, "reg=0x%04x, data=0x%02x", reg, gspca_dev->usb_buf[0]);
PDEBUG(D_USBI, "GET 01 0000 %04x %02x", reg, gspca_dev->usb_buf[0]);
if (ret < 0)
err("read failed %d", ret);
return gspca_dev->usb_buf[0];
Expand Down Expand Up @@ -558,7 +558,7 @@ static int sccb_check_status(struct gspca_dev *gspca_dev)

static void sccb_reg_write(struct gspca_dev *gspca_dev, u8 reg, u8 val)
{
PDEBUG(D_USBO, "reg: 0x%02x, val: 0x%02x", reg, val);
PDEBUG(D_USBO, "sccb write: %02x %02x", reg, val);
ov534_reg_write(gspca_dev, OV534_REG_SUBADDR, reg);
ov534_reg_write(gspca_dev, OV534_REG_WRITE, val);
ov534_reg_write(gspca_dev, OV534_REG_OPERATION, OV534_OP_WRITE_3);
Expand Down

0 comments on commit 5c26b52

Please sign in to comment.