From: Ismael Luceno Date: Wed, 24 Dec 2014 11:36:01 +0000 (-0300) Subject: [media] solo6x10: Fix solo_eeprom_read retval type X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b1bb7ee2d973ac4cd32f18f1801600ac502d37fa;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git [media] solo6x10: Fix solo_eeprom_read retval type s/unsigned short/u16/ Signed-off-by: Ismael Luceno Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- 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);