diff options
author | Ismael Luceno <ismael@iodev.co.uk> | 2014-12-24 06:36:01 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-01-27 07:03:00 -0500 |
commit | b1bb7ee2d973ac4cd32f18f1801600ac502d37fa (patch) | |
tree | 02202b5cf96462c8f9015d1854a97ca5b723629b /drivers/media/pci/solo6x10 | |
parent | 469ac53e7c99b51bf0fa4ea0955271272e4ca2ea (diff) |
[media] solo6x10: Fix solo_eeprom_read retval type
s/unsigned short/u16/
Signed-off-by: Ismael Luceno <ismael@iodev.co.uk>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/pci/solo6x10')
-rw-r--r-- | drivers/media/pci/solo6x10/solo6x10-eeprom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/solo6x10/solo6x10-eeprom.c b/drivers/media/pci/solo6x10/solo6x10-eeprom.c index da25ce4a6952..8e81186dc785 100644 --- a/drivers/media/pci/solo6x10/solo6x10-eeprom.c +++ b/drivers/media/pci/solo6x10/solo6x10-eeprom.c | |||
@@ -103,7 +103,7 @@ unsigned int solo_eeprom_ewen(struct solo_dev *solo_dev, int w_en) | |||
103 | __be16 solo_eeprom_read(struct solo_dev *solo_dev, int loc) | 103 | __be16 solo_eeprom_read(struct solo_dev *solo_dev, int loc) |
104 | { | 104 | { |
105 | int read_cmd = loc | (EE_READ_CMD << ADDR_LEN); | 105 | int read_cmd = loc | (EE_READ_CMD << ADDR_LEN); |
106 | unsigned short retval = 0; | 106 | u16 retval = 0; |
107 | int i; | 107 | int i; |
108 | 108 | ||
109 | solo_eeprom_cmd(solo_dev, read_cmd); | 109 | solo_eeprom_cmd(solo_dev, read_cmd); |