summaryrefslogtreecommitdiff
path: root/drivers/media/pci/solo6x10/solo6x10.h
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-08-20 16:27:38 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-09-03 08:55:39 -0300
commitc44b6484db6e285cbc63bb8d400b5e8873e3a8d2 (patch)
treedebd4efb4a345d1e0d0df90c53dc015988616dfa /drivers/media/pci/solo6x10/solo6x10.h
parent3ee733ea9c3d7c31469ec4f88319d32f019b8d09 (diff)
[media] solo6x10: fix sparse warnings
drivers/media/pci/solo6x10/solo6x10-disp.c:184:24: warning: incorrect type in assignment (different base types) drivers/media/pci/solo6x10/solo6x10-disp.c:223:32: warning: incorrect type in assignment (different base types) Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/pci/solo6x10/solo6x10.h')
-rw-r--r--drivers/media/pci/solo6x10/solo6x10.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h
index c6154b00fcbd..72017b7f0a75 100644
--- a/drivers/media/pci/solo6x10/solo6x10.h
+++ b/drivers/media/pci/solo6x10/solo6x10.h
@@ -394,9 +394,9 @@ int solo_osd_print(struct solo_enc_dev *solo_enc);
/* EEPROM commands */
unsigned int solo_eeprom_ewen(struct solo_dev *solo_dev, int w_en);
-unsigned short solo_eeprom_read(struct solo_dev *solo_dev, int loc);
+__be16 solo_eeprom_read(struct solo_dev *solo_dev, int loc);
int solo_eeprom_write(struct solo_dev *solo_dev, int loc,
- unsigned short data);
+ __be16 data);
/* JPEG Qp functions */
void solo_s_jpeg_qp(struct solo_dev *solo_dev, unsigned int ch,