mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/media/i2c/s5k6a3.c
..
..
@@ -1,12 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * Samsung S5K6A3 image sensor driver
3
4
  *
4
5
  * Copyright (C) 2013 Samsung Electronics Co., Ltd.
5
6
  * Author: Sylwester Nawrocki <s.nawrocki@samsung.com>
6
- *
7
- * This program is free software; you can redistribute it and/or modify
8
- * it under the terms of the GNU General Public License version 2 as
9
- * published by the Free Software Foundation.
10
7
  */
11
8
 
12
9
 #include <linux/clk.h>
..
..
@@ -200,7 +197,7 @@
200
197
 
201
198
 	ret = pm_runtime_get(sensor->dev);
202
199
 	if (ret < 0)
203
-		return ret;
200
+		goto error_rpm_put;
204
201
 
205
202
 	ret = regulator_enable(sensor->supplies[i].consumer);
206
203
 	if (ret < 0)
..
..
@@ -278,8 +275,7 @@
278
275
 	.pad = &s5k6a3_pad_ops,
279
276
 };
280
277
 
281
-static int s5k6a3_probe(struct i2c_client *client,
282
-				const struct i2c_device_id *id)
278
+static int s5k6a3_probe(struct i2c_client *client)
283
279
 {
284
280
 	struct device *dev = &client->dev;
285
281
 	struct s5k6a3 *sensor;
..
..
@@ -381,7 +377,7 @@
381
377
 		.of_match_table	= of_match_ptr(s5k6a3_of_match),
382
378
 		.name		= S5K6A3_DRV_NAME,
383
379
 	},
384
-	.probe		= s5k6a3_probe,
380
+	.probe_new	= s5k6a3_probe,
385
381
 	.remove		= s5k6a3_remove,
386
382
 	.id_table	= s5k6a3_ids,
387
383
 };