diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-11 12:25:10 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-16 20:36:56 -0400 |
commit | 064fd169c508ce20e35babdd82946dab7219ccc5 (patch) | |
tree | b85fe838b2737922a31c3e760ae5b9d389b1fe95 /drivers/media | |
parent | 4176e7ea8885a3cb3f5bbbf28480b421ef9b8f47 (diff) |
[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')
-rw-r--r-- | drivers/media/tuners/r820t.c | 4 |
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) | |||
1298 | { | 1298 | { |
1299 | int rc; | 1299 | int rc; |
1300 | 1300 | ||
1301 | /* If device was not initialized yet, don't need to standby */ | ||
1302 | if (!priv->init_done) | ||
1303 | return 0; | ||
1304 | |||
1301 | rc = r820t_write_reg(priv, 0x06, 0xb1); | 1305 | rc = r820t_write_reg(priv, 0x06, 0xb1); |
1302 | if (rc < 0) | 1306 | if (rc < 0) |
1303 | return rc; | 1307 | return rc; |