hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf
kernel/drivers/media/usb/dvb-usb/dvb-usb-i2c.c
....@@ -17,21 +17,26 @@
1717
1818 if (d->props.i2c_algo == NULL) {
1919 err("no i2c algorithm specified");
20
- return -EINVAL;
20
+ ret = -EINVAL;
21
+ goto err;
2122 }
2223
23
- strlcpy(d->i2c_adap.name, d->desc->name, sizeof(d->i2c_adap.name));
24
+ strscpy(d->i2c_adap.name, d->desc->name, sizeof(d->i2c_adap.name));
2425 d->i2c_adap.algo = d->props.i2c_algo;
2526 d->i2c_adap.algo_data = NULL;
2627 d->i2c_adap.dev.parent = &d->udev->dev;
2728
2829 i2c_set_adapdata(&d->i2c_adap, d);
2930
30
- if ((ret = i2c_add_adapter(&d->i2c_adap)) < 0)
31
+ ret = i2c_add_adapter(&d->i2c_adap);
32
+ if (ret < 0) {
3133 err("could not add i2c adapter");
34
+ goto err;
35
+ }
3236
3337 d->state |= DVB_USB_STATE_I2C;
3438
39
+err:
3540 return ret;
3641 }
3742