Commit 30d65282 authored Mar 07, 2014 by Hans Verkuil Committed by Mauro Carvalho Chehab Mar 28, 2014

[media] saa7134: fix WARN_ON during resume

Do not attempt to reload the tuner modules when resuming after a suspend.
This triggers a WARN_ON in kernel/kmod.c:148 __request_module.

This fixes https://bugzilla.kernel.org/show_bug.cgi?id=69581

.

This has always been wrong, but it was never noticed until the WARN_ON
was added in 3.9.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: stable@vger.kernel.org      # for v3.9 and up
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

parent c4885ada

drivers/media/pci/saa7134/saa7134-cards.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -8045,8 +8045,8 @@ int saa7134_board_init2(struct saa7134_dev *dev)
		break;
		} /* switch() */

		/* initialize tuner */
		if (TUNER_ABSENT != dev->tuner_type) {
		/* initialize tuner (don't do this when resuming) */
		if (!dev->insuspend && TUNER_ABSENT != dev->tuner_type) {
		int has_demod = (dev->tda9887_conf & TDA9887_PRESENT);

		/* Note: radio tuner address is always filled in,