labbott pushed to kernel (f21). "Fix DVB oops (rhbz 1220118)"

[notifications at fedoraproject.org]

From 2dc7a021b1ac691f8c91ec05d9c5867688ff3469 Mon Sep 17 00:00:00 2001
From: Laura Abbott <labbott at fedoraproject.org>
Date: Fri, 15 May 2015 13:59:20 -0700
Subject: Fix DVB oops (rhbz 1220118)


diff --git a/0001-media-media-Fix-regression-in-some-more-dib0700-base.patch b/0001-media-media-Fix-regression-in-some-more-dib0700-base.patch
new file mode 100644
index 0000000..a61969e
--- /dev/null
+++ b/0001-media-media-Fix-regression-in-some-more-dib0700-base.patch
@@ -0,0 +1,58 @@
+From e989a73ebd09d22c22ead51fa363a2f56f70f28a Mon Sep 17 00:00:00 2001
+From: Thomas Reitmayr <treitmayr at devbase.at>
+Date: Fri, 1 May 2015 20:18:04 -0300
+Subject: [PATCH] [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 at vger.kernel.org # for version 3.17+
+Signed-off-by: Thomas Reitmayr <treitmayr at devbase.at>
+Signed-off-by: Mauro Carvalho Chehab <mchehab at 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 90cee38..e87ce83 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),
+ 			},
+ 		},
+ 
+-- 
+2.1.0
+
diff --git a/kernel.spec b/kernel.spec
index 7432894..3b59219 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -658,6 +658,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: 0001-media-media-Fix-regression-in-some-more-dib0700-base.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1419,6 +1422,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 0001-media-media-Fix-regression-in-some-more-dib0700-base.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2278,6 +2284,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Fri May 15 2015 Laura Abbott <labbott at fedoraproject.org>
+- Fix DVB oops (rhbz 1220118)
+
 * Thu May 14 2015 Justin M. Forbes <jforbes at fedoraproject.org> - 4.0.3-201
 - Linux v4.0.3
 - Disable i915 verbose state checks
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kernel.git/commit/?h=f21&id=2dc7a021b1ac691f8c91ec05d9c5867688ff3469