]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
[media] media: Fix regression in some more dib0700 based devices
authorThomas Reitmayr <treitmayr@devbase.at>
Fri, 1 May 2015 23:18:04 +0000 (20:18 -0300)
committerSasha Levin <sasha.levin@oracle.com>
Sat, 4 Jul 2015 03:02:17 +0000 (23:02 -0400)
[ Upstream commit e989a73ebd09d22c22ead51fa363a2f56f70f28a ]

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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
drivers/media/usb/dvb-usb/dib0700_devices.c

index e1757b8f5f5d0e7775abbc91c40bba817fec9d3d..6aa4e9f4e4418207b904ad68531503c03d85e6e0 100644 (file)
@@ -3947,6 +3947,8 @@ struct dvb_usb_device_properties dib0700_devices[] = {
 
                                DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
                        }},
+                               .size_of_priv = sizeof(struct
+                                               dib0700_adapter_state),
                        }, {
                        .num_frontends = 1,
                        .fe = {{
@@ -3959,6 +3961,8 @@ struct dvb_usb_device_properties dib0700_devices[] = {
 
                                DIB0700_DEFAULT_STREAMING_CONFIG(0x03),
                        }},
+                               .size_of_priv = sizeof(struct
+                                               dib0700_adapter_state),
                        }
                },
 
@@ -4012,6 +4016,8 @@ struct dvb_usb_device_properties dib0700_devices[] = {
 
                                DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
                        }},
+                               .size_of_priv = sizeof(struct
+                                               dib0700_adapter_state),
                        },
                },