summaryrefslogtreecommitdiff
path: root/drivers/media/usb
diff options
context:
space:
mode:
authorAlban Browaeys <alban.browaeys@gmail.com>2013-07-16 21:57:53 (GMT)
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-09-03 12:24:20 (GMT)
commit32bf7c6cdf63a6704822c81b7139c54ac1cbd6a1 (patch)
treecc6881ed60e06b569ef2eb6e899847395eaa0fe4 /drivers/media/usb
parent2e923a0527ac439e135b9961e58d3acd876bba10 (diff)
downloadlinux-fsl-qoriq-32bf7c6cdf63a6704822c81b7139c54ac1cbd6a1.tar.xz
[media] em28xx: fix assignment of the eeprom data
Set the config structure pointer to the eeprom data pointer (data, here eedata dereferenced) not the pointer to the pointer to the eeprom data (eedata itself). Signed-off-by: Alban Browaeys <prahal@yahoo.com> Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com> Cc: stable@vger.kernel.org # for v3.10 Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/media/usb')
-rw-r--r--drivers/media/usb/em28xx/em28xx-i2c.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-i2c.c b/drivers/media/usb/em28xx/em28xx-i2c.c
index 4851cc2..c4ff973 100644
--- a/drivers/media/usb/em28xx/em28xx-i2c.c
+++ b/drivers/media/usb/em28xx/em28xx-i2c.c
@@ -726,7 +726,7 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned bus,
*eedata = data;
*eedata_len = len;
- dev_config = (void *)eedata;
+ dev_config = (void *)*eedata;
switch (le16_to_cpu(dev_config->chip_conf) >> 4 & 0x3) {
case 0: