From: Greg Kroah-Hartman Date: Sat, 24 Feb 2007 00:27:37 +0000 (-0800) Subject: remove a v4l patch that shouldn't have been there... X-Git-Tag: v2.6.19.5^0 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f29a069145770033c04d47c68e3c844c11aa202;p=thirdparty%2Fkernel%2Fstable-queue.git remove a v4l patch that shouldn't have been there... --- diff --git a/review-2.6.19/V4L-cx88-Fix-lockup-on-suspend.patch b/review-2.6.19/V4L-cx88-Fix-lockup-on-suspend.patch deleted file mode 100644 index f00c4974e43..00000000000 --- a/review-2.6.19/V4L-cx88-Fix-lockup-on-suspend.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 93b966dfcbb67f5fc80f72c8962942bc7cd2a433 Mon Sep 17 00:00:00 2001 -From: Robert Hancock -Date: Sun, 7 Jan 2007 08:12:19 -0300 -Subject: [PATCH] V4L: cx88: Fix lockup on suspend - -Suspending with the cx88xx module loaded causes the system to lock up -because the cx88_audio_thread kthread was missing a try_to_freeze() -call, which caused it to go into a tight loop and result in softlockup -when suspending. Fix that. - -(cherry picked from commit a96afb3e9428f2e7463344f12dbc85faf08e2e09) - -Signed-off-by: Robert Hancock -Signed-off-by: Mauro Carvalho Chehab -Signed-off-by: Michael Krufky -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/media/video/cx88/cx88-tvaudio.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- linux-2.6.19.4.orig/drivers/media/video/cx88/cx88-tvaudio.c -+++ linux-2.6.19.4/drivers/media/video/cx88/cx88-tvaudio.c -@@ -38,6 +38,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -974,6 +975,7 @@ int cx88_audio_thread(void *data) - msleep_interruptible(1000); - if (kthread_should_stop()) - break; -+ try_to_freeze(); - - /* just monitor the audio status for now ... */ - memset(&t, 0, sizeof(t)); diff --git a/review-2.6.19/series b/review-2.6.19/series index bddcb6636fe..3cef10cf3cd 100644 --- a/review-2.6.19/series +++ b/review-2.6.19/series @@ -1,4 +1,3 @@ -V4L-cx88-Fix-lockup-on-suspend.patch V4L-Fix-quickcam-communicator-driver-for-big-endian-architectures.patch V4L-fix-ks0127-status-flags.patch V4L-tveeprom-autodetect-LG-TAPC-G701D-as-tuner-type-37.patch