aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/saa7134
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-03-07 05:28:39 -0500
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-03-28 17:09:49 -0400
commit30d652823de5fd7907d40e969a2d8e23938d8d03 (patch)
tree4d234fc5fc31aabb9ecd6ded9884be530280c37d /drivers/media/pci/saa7134
parentc4885ada88e4331f8ac56d14296d0058359db2d7 (diff)
[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>
Diffstat (limited to 'drivers/media/pci/saa7134')
-rw-r--r--drivers/media/pci/saa7134/saa7134-cards.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/pci/saa7134/saa7134-cards.c b/drivers/media/pci/saa7134/saa7134-cards.c
index c9b2350e92c8..6e4bdb90aa92 100644
--- a/drivers/media/pci/saa7134/saa7134-cards.c
+++ b/drivers/media/pci/saa7134/saa7134-cards.c
@@ -8045,8 +8045,8 @@ int saa7134_board_init2(struct saa7134_dev *dev)
8045 break; 8045 break;
8046 } /* switch() */ 8046 } /* switch() */
8047 8047
8048 /* initialize tuner */ 8048 /* initialize tuner (don't do this when resuming) */
8049 if (TUNER_ABSENT != dev->tuner_type) { 8049 if (!dev->insuspend && TUNER_ABSENT != dev->tuner_type) {
8050 int has_demod = (dev->tda9887_conf & TDA9887_PRESENT); 8050 int has_demod = (dev->tda9887_conf & TDA9887_PRESENT);
8051 8051
8052 /* Note: radio tuner address is always filled in, 8052 /* Note: radio tuner address is always filled in,