summaryrefslogtreecommitdiffstats
path: root/drivers/media/tuners
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2013-04-11 13:25:10 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-04-16 21:36:56 -0300
commit064fd169c508ce20e35babdd82946dab7219ccc5 (patch)
treeb85fe838b2737922a31c3e760ae5b9d389b1fe95 /drivers/media/tuners
parent4176e7ea8885a3cb3f5bbbf28480b421ef9b8f47 (diff)
downloadtalos-obmc-linux-064fd169c508ce20e35babdd82946dab7219ccc5.tar.gz
talos-obmc-linux-064fd169c508ce20e35babdd82946dab7219ccc5.zip
[media] r820t: Don't put it in standby if not initialized yet
r820t_standby() can be called before r820t_init(). If that happens, just do nothing. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Tested-by: Antti Palosaari <crope@iki.fi>
Diffstat (limited to 'drivers/media/tuners')
-rw-r--r--drivers/media/tuners/r820t.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/tuners/r820t.c b/drivers/media/tuners/r820t.c
index fc660f27edb3..b679a3f1fb7a 100644
--- a/drivers/media/tuners/r820t.c
+++ b/drivers/media/tuners/r820t.c
@@ -1298,6 +1298,10 @@ static int r820t_standby(struct r820t_priv *priv)
{
int rc;
+ /* If device was not initialized yet, don't need to standby */
+ if (!priv->init_done)
+ return 0;
+
rc = r820t_write_reg(priv, 0x06, 0xb1);
if (rc < 0)
return rc;
OpenPOWER on IntegriCloud