提交 30d65282 编写于 作者: H Hans Verkuil 提交者: Mauro Carvalho Chehab

[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: NHans Verkuil <hans.verkuil@cisco.com>
Cc: stable@vger.kernel.org      # for v3.9 and up
Signed-off-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
上级 c4885ada
...@@ -8045,8 +8045,8 @@ int saa7134_board_init2(struct saa7134_dev *dev) ...@@ -8045,8 +8045,8 @@ int saa7134_board_init2(struct saa7134_dev *dev)
break; break;
} /* switch() */ } /* switch() */
/* initialize tuner */ /* initialize tuner (don't do this when resuming) */
if (TUNER_ABSENT != dev->tuner_type) { if (!dev->insuspend && TUNER_ABSENT != dev->tuner_type) {
int has_demod = (dev->tda9887_conf & TDA9887_PRESENT); int has_demod = (dev->tda9887_conf & TDA9887_PRESENT);
/* Note: radio tuner address is always filled in, /* Note: radio tuner address is always filled in,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册