summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorOlli Salonen <olli.salonen@iki.fi>2017-07-30 14:34:48 +0200
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-08-28 00:06:34 +0200
commit07d45a42fa21b54d83e563565699d25bde9f8cbe (patch)
tree35c04809435f5599a550ecd4b9e50c151da5349c /drivers/media
parentmedia: dvb_frontend: initialize variable s with FE_NONE instead of 0 (diff)
downloadlinux-07d45a42fa21b54d83e563565699d25bde9f8cbe.tar.xz
linux-07d45a42fa21b54d83e563565699d25bde9f8cbe.zip
media: mn88472: reset stream ID reg if no PLP given
If the PLP given is NO_STREAM_ID_FILTER (~0u) don't try to set that into the PLP register. Set PLP to 0 instead. Signed-off-by: Olli Salonen <olli.salonen@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb-frontends/mn88472.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/dvb-frontends/mn88472.c b/drivers/media/dvb-frontends/mn88472.c
index f6938f9607ac..5e8fd63832e9 100644
--- a/drivers/media/dvb-frontends/mn88472.c
+++ b/drivers/media/dvb-frontends/mn88472.c
@@ -377,7 +377,9 @@ static int mn88472_set_frontend(struct dvb_frontend *fe)
ret = regmap_write(dev->regmap[1], 0xf6, 0x05);
if (ret)
goto err;
- ret = regmap_write(dev->regmap[2], 0x32, c->stream_id);
+ ret = regmap_write(dev->regmap[2], 0x32,
+ (c->stream_id == NO_STREAM_ID_FILTER) ? 0 :
+ c->stream_id );
if (ret)
goto err;
break;