From: Hans Verkuil Date: Fri, 22 Mar 2013 12:54:00 +0000 (-0300) Subject: [media] em28xx: tuner setup is broken after algo_data change X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bc3d292803409ce44febffb8e6839faae6e768fb;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git [media] em28xx: tuner setup is broken after algo_data change Commit aab3125c43d8fecc7134e5f1e729fabf4dd196da broke em28xx. I traced this eventually to the change in what algo_data points to. This pointer is also passed to em28xx_tuner_callback() through several hidden tuner layers (yuck!) and that callback was not updated. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c index 46fff5c3335b..cb7cdd322702 100644 --- a/drivers/media/usb/em28xx/em28xx-cards.c +++ b/drivers/media/usb/em28xx/em28xx-cards.c @@ -2229,8 +2229,9 @@ static unsigned short msp3400_addrs[] = { int em28xx_tuner_callback(void *ptr, int component, int command, int arg) { + struct em28xx_i2c_bus *i2c_bus = ptr; + struct em28xx *dev = i2c_bus->dev; int rc = 0; - struct em28xx *dev = ptr; if (dev->tuner_type != TUNER_XC2028 && dev->tuner_type != TUNER_XC5000) return 0;