aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlban Browaeys <alban.browaeys@gmail.com>2013-07-16 18:57:53 -0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-14 22:59:06 -0700
commit630d2243751d762ea9e1baabecd6536e9db8d0be (patch)
treea1f9ead1353268646e2e3d9798506180c3d31c02
parent65967f15aa05ea23cd4fcd58db6ef4ef690982af (diff)
downloadvexpress-lsk-630d2243751d762ea9e1baabecd6536e9db8d0be.tar.gz
media: em28xx: fix assignment of the eeprom data
commit f813b5775b471b656382ae8f087bb34dc894261f upstream. 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> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 4851cc2e4a4..c4ff9739a7a 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: