update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/i2c/s5k6aa.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * Driver for Samsung S5K6AAFX SXGA 1/6" 1.3M CMOS Image Sensor
3
4
  * with embedded SoC ISP.
..
..
@@ -7,11 +8,6 @@
7
8
  *
8
9
  * Based on a driver authored by Dongsoo Nathaniel Kim.
9
10
  * Copyright (C) 2009, Dongsoo Nathaniel Kim <dongsoo45.kim@samsung.com>
10
- *
11
- * This program is free software; you can redistribute it and/or modify
12
- * it under the terms of the GNU General Public License as published by
13
- * the Free Software Foundation; either version 2 of the License, or
14
- * (at your option) any later version.
15
11
  */
16
12
 
17
13
 #include <linux/clk.h>
..
..
@@ -688,7 +684,7 @@
688
684
 	 * but there is nothing indicating how to switch between both
689
685
 	 * in the datasheet. For now default BT.601 interface is assumed.
690
686
 	 */
691
-	if (bus_type == V4L2_MBUS_CSI2)
687
+	if (bus_type == V4L2_MBUS_CSI2_DPHY)
692
688
 		cfg = nlanes;
693
689
 	else if (bus_type != V4L2_MBUS_PARALLEL)
694
690
 		return -EINVAL;
..
..
@@ -729,7 +725,7 @@
729
725
  * @s5k6aa: pointer to &struct s5k6aa describing the device
730
726
  * @preset: s5kaa preset to be applied
731
727
  *
732
- * Configure output resolution and color fromat, pixel clock
728
+ * Configure output resolution and color format, pixel clock
733
729
  * frequency range, device frame rate type and frame period range.
734
730
  */
735
731
 static int s5k6aa_set_prev_config(struct s5k6aa *s5k6aa,
..
..
@@ -1576,7 +1572,8 @@
1576
1572
 
1577
1573
 	sd = &s5k6aa->sd;
1578
1574
 	v4l2_i2c_subdev_init(sd, client, &s5k6aa_subdev_ops);
1579
-	strlcpy(sd->name, DRIVER_NAME, sizeof(sd->name));
1575
+	/* Static name; NEVER use in new drivers! */
1576
+	strscpy(sd->name, DRIVER_NAME, sizeof(sd->name));
1580
1577
 
1581
1578
 	sd->internal_ops = &s5k6aa_subdev_internal_ops;
1582
1579
 	sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;