From: Ismael Luceno <ismael@iodev.co.uk>
Date: Wed, 24 Dec 2014 11:36:01 +0000 (-0300)
Subject: [media] solo6x10: Fix solo_eeprom_read retval type
X-Git-Tag: firefly_0821_release~176^2~795^2~1628
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b1bb7ee2d973ac4cd32f18f1801600ac502d37fa;p=firefly-linux-kernel-4.4.55.git

[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>
---

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)
 __be16 solo_eeprom_read(struct solo_dev *solo_dev, int loc)
 {
 	int read_cmd = loc | (EE_READ_CMD << ADDR_LEN);
-	unsigned short retval = 0;
+	u16 retval = 0;
 	int i;
 
 	solo_eeprom_cmd(solo_dev, read_cmd);