From 6cde2904df44049dd58b5d71639a2c720c658f50 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Wed, 20 Aug 2014 17:05:17 -0300 Subject: [PATCH] [media] kinect: fix sparse warnings drivers/media/usb/gspca/kinect.c:151:19: warning: incorrect type in assignment (different base types) drivers/media/usb/gspca/kinect.c:152:19: warning: incorrect type in assignment (different base types) drivers/media/usb/gspca/kinect.c:153:19: warning: incorrect type in assignment (different base types) drivers/media/usb/gspca/kinect.c:191:13: warning: restricted __le16 degrades to integer drivers/media/usb/gspca/kinect.c:217:16: warning: incorrect type in assignment (different base types) drivers/media/usb/gspca/kinect.c:218:16: warning: incorrect type in assignment (different base types) Note that this fixes a real bug where cpu_to_le16 was used instead of the correct le16_to_cpu. Signed-off-by: Hans Verkuil Acked-by: Antonio Ospite Signed-off-by: Mauro Carvalho Chehab --- drivers/media/usb/gspca/kinect.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/media/usb/gspca/kinect.c b/drivers/media/usb/gspca/kinect.c index 45bc1f51c5d8..3cb30a37d6ac 100644 --- a/drivers/media/usb/gspca/kinect.c +++ b/drivers/media/usb/gspca/kinect.c @@ -51,9 +51,9 @@ struct pkt_hdr { struct cam_hdr { uint8_t magic[2]; - uint16_t len; - uint16_t cmd; - uint16_t tag; + __le16 len; + __le16 cmd; + __le16 tag; }; /* specific webcam descriptor */ @@ -188,9 +188,9 @@ static int send_cmd(struct gspca_dev *gspca_dev, uint16_t cmd, void *cmdbuf, rhdr->tag, chdr->tag); return -1; } - if (cpu_to_le16(rhdr->len) != (actual_len/2)) { + if (le16_to_cpu(rhdr->len) != (actual_len/2)) { pr_err("send_cmd: Bad len %04x != %04x\n", - cpu_to_le16(rhdr->len), (int)(actual_len/2)); + le16_to_cpu(rhdr->len), (int)(actual_len/2)); return -1; } @@ -211,7 +211,7 @@ static int write_register(struct gspca_dev *gspca_dev, uint16_t reg, uint16_t data) { uint16_t reply[2]; - uint16_t cmd[2]; + __le16 cmd[2]; int res; cmd[0] = cpu_to_le16(reg); -- 2.34.1