aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/dvb-usb/dib0700_devices.c
diff options
context:
space:
mode:
authorThomas Reitmayr <treitmayr@devbase.at>2015-05-01 19:18:04 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-05-13 17:18:39 -0400
commite989a73ebd09d22c22ead51fa363a2f56f70f28a (patch)
treec405be6fd71758ce671ddbfdfb61d60fd88735d2 /drivers/media/usb/dvb-usb/dib0700_devices.c
parent356484cabe44984d2dc66a90bd5e3465ba1f64fb (diff)
[media] media: Fix regression in some more dib0700 based devices
Fix an oops during device initialization by correctly setting size_of_priv instead of leaving it 0. The regression was introduced by 8abe4a0a3f6d4217b16a ("[media] dib7000: export just one symbol") and only fixed for one type of dib0700 based devices in 9e334c75642b6e5bfb95 ("[media] Fix regression in some dib0700 based devices"). Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=92301 Fixes: 8abe4a0a3f6d4217b16a ("[media] dib7000: export just one symbol") Cc: stable@vger.kernel.org # for version 3.17+ Signed-off-by: Thomas Reitmayr <treitmayr@devbase.at> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/dvb-usb/dib0700_devices.c')
-rw-r--r--drivers/media/usb/dvb-usb/dib0700_devices.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c
index 90cee380d3aa..e87ce835dcbd 100644
--- a/drivers/media/usb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/usb/dvb-usb/dib0700_devices.c
@@ -3944,6 +3944,8 @@ struct dvb_usb_device_properties dib0700_devices[] = {
3944 3944
3945 DIB0700_DEFAULT_STREAMING_CONFIG(0x02), 3945 DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
3946 }}, 3946 }},
3947 .size_of_priv = sizeof(struct
3948 dib0700_adapter_state),
3947 }, { 3949 }, {
3948 .num_frontends = 1, 3950 .num_frontends = 1,
3949 .fe = {{ 3951 .fe = {{
@@ -3956,6 +3958,8 @@ struct dvb_usb_device_properties dib0700_devices[] = {
3956 3958
3957 DIB0700_DEFAULT_STREAMING_CONFIG(0x03), 3959 DIB0700_DEFAULT_STREAMING_CONFIG(0x03),
3958 }}, 3960 }},
3961 .size_of_priv = sizeof(struct
3962 dib0700_adapter_state),
3959 } 3963 }
3960 }, 3964 },
3961 3965
@@ -4009,6 +4013,8 @@ struct dvb_usb_device_properties dib0700_devices[] = {
4009 4013
4010 DIB0700_DEFAULT_STREAMING_CONFIG(0x02), 4014 DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
4011 }}, 4015 }},
4016 .size_of_priv = sizeof(struct
4017 dib0700_adapter_state),
4012 }, 4018 },
4013 }, 4019 },
4014 4020