summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-05-18 13:15:55 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-05-18 13:15:55 -0400
commitf67345e16fb06bb2ad6541d93f100537c9d934de (patch)
tree182040be77a80c6c3723718a754c59885c477488
parent6ab5f42335533a1673216e68b3fec9d06531e597 (diff)
downloadkernel-f67345e16fb06bb2ad6541d93f100537c9d934de.tar.gz
kernel-f67345e16fb06bb2ad6541d93f100537c9d934de.tar.xz
kernel-f67345e16fb06bb2ad6541d93f100537c9d934de.zip
Fix DVB oops (rhbz 1220118)
-rw-r--r--kernel.spec9
-rw-r--r--media-Fix-regression-in-some-more-dib0700-based-devi.patch53
2 files changed, 62 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 40be76294..f0c98931a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -616,6 +616,9 @@ Patch26200: 0001-HID-usbhid-Add-HID_QUIRK_NOGET-for-Aten-DVI-KVM-swit.patch
#rhbz 1220915
Patch26201: ovl-don-t-remove-non-empty-opaque-directory.patch
+#rhbz 1220118
+Patch26202: media-Fix-regression-in-some-more-dib0700-based-devi.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1353,6 +1356,9 @@ ApplyPatch 0001-HID-usbhid-Add-HID_QUIRK_NOGET-for-Aten-DVI-KVM-swit.patch
#rhbz 1220915
ApplyPatch ovl-don-t-remove-non-empty-opaque-directory.patch
+#rhbz 1220118
+ApplyPatch media-Fix-regression-in-some-more-dib0700-based-devi.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2213,6 +2219,9 @@ fi
#
#
%changelog
+* Mon May 18 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix DVB oops (rhbz 1220118)
+
* Mon May 18 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc3.git4.1
- Linux v4.1-rc3-346-gc0655fe9b090
- Enable in-kernel vmmouse driver (rhbz 1214474)
diff --git a/media-Fix-regression-in-some-more-dib0700-based-devi.patch b/media-Fix-regression-in-some-more-dib0700-based-devi.patch
new file mode 100644
index 000000000..590b22588
--- /dev/null
+++ b/media-Fix-regression-in-some-more-dib0700-based-devi.patch
@@ -0,0 +1,53 @@
+From: Thomas Reitmayr <treitmayr@devbase.at>
+Date: Fri, 1 May 2015 20:18:04 -0300
+Subject: [PATCH] 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>
+---
+ drivers/media/usb/dvb-usb/dib0700_devices.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c
+index d7d55a20e959..c170523226aa 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[] = {
+
+ DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
+ }},
++ .size_of_priv = sizeof(struct
++ dib0700_adapter_state),
+ }, {
+ .num_frontends = 1,
+ .fe = {{
+@@ -3956,6 +3958,8 @@ struct dvb_usb_device_properties dib0700_devices[] = {
+
+ DIB0700_DEFAULT_STREAMING_CONFIG(0x03),
+ }},
++ .size_of_priv = sizeof(struct
++ dib0700_adapter_state),
+ }
+ },
+
+@@ -4009,6 +4013,8 @@ struct dvb_usb_device_properties dib0700_devices[] = {
+
+ DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
+ }},
++ .size_of_priv = sizeof(struct
++ dib0700_adapter_state),
+ },
+ },
+