Chuck Ebbert wrote: > Greg KH wrote: >> -stable review patch. If anyone has any objections, please let us know. >> >> ------------------ >> 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 <[EMAIL PROTECTED]> >> Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]> >> Signed-off-by: Michael Krufky <[EMAIL PROTECTED]> >> Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]> >> >> --- >> 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 <linux/module.h> >> #include <linux/moduleparam.h> >> #include <linux/errno.h> >> +#include <linux/freezer.h> >> #include <linux/kernel.h> >> #include <linux/slab.h> >> #include <linux/mm.h> >> @@ -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)); >> > > drivers/media/video/cx88/cx88-tvaudio.c:41:27: error: linux/freezer.h: No > such file or directory > make[4]: *** [drivers/media/video/cx88/cx88-tvaudio.o] Error 1 > make[3]: *** [drivers/media/video/cx88] Error 2 > make[3]: *** Waiting for unfinished jobs.... >
Yikes... This one shouldn't have been sent to 2.6.18.y nor 2.6.19.y ... tree-mixup :-/ Please drop this one. Thanks, Chuck. Sorry about that... -Mike Krufky - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
