mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/media/dvb-frontends/zd1301_demod.c
..
..
@@ -1,17 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * ZyDAS ZD1301 driver (demodulator)
3
4
  *
4
5
  * Copyright (C) 2015 Antti Palosaari <crope@iki.fi>
5
- *
6
- *    This program is free software; you can redistribute it and/or modify
7
- *    it under the terms of the GNU General Public License as published by
8
- *    the Free Software Foundation; either version 2 of the License, or
9
- *    (at your option) any later version.
10
- *
11
- *    This program is distributed in the hope that it will be useful,
12
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
- *    GNU General Public License for more details.
15
6
  */
16
7
 
17
8
 #include "zd1301_demod.h"
..
..
@@ -430,8 +421,7 @@
430
421
 	} else {
431
422
 		dev_dbg(&pdev->dev, "unknown msg[0].len=%u\n", msg[0].len);
432
423
 		ret = -EOPNOTSUPP;
433
-		if (ret)
434
-			goto err;
424
+		goto err;
435
425
 	}
436
426
 
437
427
 	return num;
..
..
@@ -499,7 +489,8 @@
499
489
 		goto err_kfree;
500
490
 
501
491
 	/* Create I2C adapter */
502
-	strlcpy(dev->adapter.name, "ZyDAS ZD1301 demod", sizeof(dev->adapter.name));
492
+	strscpy(dev->adapter.name, "ZyDAS ZD1301 demod",
493
+		sizeof(dev->adapter.name));
503
494
 	dev->adapter.algo = &zd1301_demod_i2c_algorithm;
504
495
 	dev->adapter.algo_data = NULL;
505
496
 	dev->adapter.dev.parent = pdev->dev.parent;