Skip to content

Commit

Permalink
V4L/DVB (7970): mix trivial endianness annotations
Browse files Browse the repository at this point in the history
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Al Viro authored and Mauro Carvalho Chehab committed Jun 5, 2008
1 parent fa9c13a commit a954b66
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions drivers/media/video/em28xx/em28xx-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -1166,13 +1166,13 @@ static int vidioc_g_register(struct file *file, void *priv,

reg->val = ret;
} else {
u64 val = 0;
__le64 val = 0;
ret = em28xx_read_reg_req_len(dev, USB_REQ_GET_STATUS,
reg->reg, (char *)&val, 2);
if (ret < 0)
return ret;

reg->val = cpu_to_le64((__u64)val);
reg->val = le64_to_cpu(val);
}

return 0;
Expand All @@ -1183,9 +1183,9 @@ static int vidioc_s_register(struct file *file, void *priv,
{
struct em28xx_fh *fh = priv;
struct em28xx *dev = fh->dev;
u64 buf;
__le64 buf;

buf = le64_to_cpu((__u64)reg->val);
buf = cpu_to_le64(reg->val);

return em28xx_write_regs(dev, reg->reg, (char *)&buf,
em28xx_reg_len(reg->reg));
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/video/usbvideo/quickcam_messenger.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ static int qcm_stv_setb(struct usb_device *dev, u16 reg, u8 val)
return ret;
}

static int qcm_stv_setw(struct usb_device *dev, u16 reg, u16 val)
static int qcm_stv_setw(struct usb_device *dev, u16 reg, __le16 val)
{
int ret;

Expand Down

0 comments on commit a954b66

Please sign in to comment.