media: replace strncpy() by strscpy()

[linux-block.git] / drivers / media / dvb-frontends / m88ds3103.c

diff --git a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontends/m88ds3103.c
index 123f2a33738b07f7da057fcd237409e62e8a24cd..b543e1c4c4f9fdaeb62070d1ecd2cc9d526e0272 100644 (file)
--- a/drivers/media/dvb-frontends/m88ds3103.c
+++ b/drivers/media/dvb-frontends/m88ds3103.c
@@ -309,6 +309,9 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
        u16 u16tmp;
        u32 tuner_frequency_khz, target_mclk;
        s32 s32tmp;
+       static const struct reg_sequence reset_buf[] = {
+               {0x07, 0x80}, {0x07, 0x00}
+       };
 
        dev_dbg(&client->dev,
                "delivery_system=%d modulation=%d frequency=%u symbol_rate=%d inversion=%d pilot=%d rolloff=%d\n",
@@ -321,11 +324,7 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
        }
 
        /* reset */
-       ret = regmap_write(dev->regmap, 0x07, 0x80);
-       if (ret)
-               goto err;
-
-       ret = regmap_write(dev->regmap, 0x07, 0x00);
+       ret = regmap_multi_reg_write(dev->regmap, reset_buf, 2);
        if (ret)
                goto err;
 
@@ -1470,7 +1469,7 @@ static int m88ds3103_probe(struct i2c_client *client,
        /* create dvb_frontend */
        memcpy(&dev->fe.ops, &m88ds3103_ops, sizeof(struct dvb_frontend_ops));
        if (dev->chip_id == M88RS6000_CHIP_ID)
-               strncpy(dev->fe.ops.info.name, "Montage Technology M88RS6000",
+               strscpy(dev->fe.ops.info.name, "Montage Technology M88RS6000",
                        sizeof(dev->fe.ops.info.name));
        if (!pdata->attach_in_use)
                dev->fe.ops.release = NULL;