Skip to content

Commit 518b21b

Browse files
torvaldstorvalds
committed
Merge tag 'media/v6.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab: - drop the redundant pm_runtime_mark_last_busy() in rkvdec - fix probing error handling in rkvdec - fix an issue affecting lt6911uxe/lt6911uxc related to CSI-2 GPIO pins in int3472 * tag 'media/v6.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: media: Remove redundant pm_runtime_mark_last_busy() calls platform/x86: int3472: add hpd pin support media: rkvdec: Remove redundant pm_runtime_mark_last_busy() calls media: rkvdec: Fix an error handling path in rkvdec_probe() media: rkvdec: Fix a NULL vs IS_ERR() bug in probe()
2 parents fab1bed + 6f6fbd9 commit 518b21b

File tree

32 files changed

+19
-97
lines changed

32 files changed

+19
-97
lines changed

‎drivers/media/i2c/alvium-csi2.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1841,7 +1841,6 @@ static int alvium_s_stream(struct v4l2_subdev *sd, int enable)
18411841

18421842
} else {
18431843
alvium_set_stream_mipi(alvium, enable);
1844-
pm_runtime_mark_last_busy(&client->dev);
18451844
pm_runtime_put_autosuspend(&client->dev);
18461845
}
18471846

‎drivers/media/i2c/ccs/ccs-core.c‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -787,10 +787,8 @@ static int ccs_set_ctrl(struct v4l2_ctrl *ctrl)
787787
rval = -EINVAL;
788788
}
789789

790-
if (pm_status > 0) {
791-
pm_runtime_mark_last_busy(&client->dev);
790+
if (pm_status > 0)
792791
pm_runtime_put_autosuspend(&client->dev);
793-
}
794792

795793
return rval;
796794
}
@@ -1914,7 +1912,6 @@ static int ccs_set_stream(struct v4l2_subdev *subdev, int enable)
19141912
if (!enable) {
19151913
ccs_stop_streaming(sensor);
19161914
sensor->streaming = false;
1917-
pm_runtime_mark_last_busy(&client->dev);
19181915
pm_runtime_put_autosuspend(&client->dev);
19191916

19201917
return 0;
@@ -1929,7 +1926,6 @@ static int ccs_set_stream(struct v4l2_subdev *subdev, int enable)
19291926
rval = ccs_start_streaming(sensor);
19301927
if (rval < 0) {
19311928
sensor->streaming = false;
1932-
pm_runtime_mark_last_busy(&client->dev);
19331929
pm_runtime_put_autosuspend(&client->dev);
19341930
}
19351931

@@ -2677,7 +2673,6 @@ nvm_show(struct device *dev, struct device_attribute *attr, char *buf)
26772673
return -ENODEV;
26782674
}
26792675

2680-
pm_runtime_mark_last_busy(&client->dev);
26812676
pm_runtime_put_autosuspend(&client->dev);
26822677

26832678
/*

‎drivers/media/i2c/dw9768.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,6 @@ static int dw9768_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
374374

375375
static int dw9768_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
376376
{
377-
pm_runtime_mark_last_busy(sd->dev);
378377
pm_runtime_put_autosuspend(sd->dev);
379378

380379
return 0;

‎drivers/media/i2c/gc0308.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -974,7 +974,6 @@ static int gc0308_s_ctrl(struct v4l2_ctrl *ctrl)
974974
if (ret)
975975
dev_err(gc0308->dev, "failed to set control: %d\n", ret);
976976

977-
pm_runtime_mark_last_busy(gc0308->dev);
978977
pm_runtime_put_autosuspend(gc0308->dev);
979978

980979
return ret;
@@ -1157,14 +1156,12 @@ static int gc0308_start_stream(struct gc0308 *gc0308)
11571156
return 0;
11581157

11591158
disable_pm:
1160-
pm_runtime_mark_last_busy(gc0308->dev);
11611159
pm_runtime_put_autosuspend(gc0308->dev);
11621160
return ret;
11631161
}
11641162

11651163
static int gc0308_stop_stream(struct gc0308 *gc0308)
11661164
{
1167-
pm_runtime_mark_last_busy(gc0308->dev);
11681165
pm_runtime_put_autosuspend(gc0308->dev);
11691166
return 0;
11701167
}

‎drivers/media/i2c/gc2145.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,6 @@ static int gc2145_enable_streams(struct v4l2_subdev *sd,
963963
return 0;
964964

965965
err_rpm_put:
966-
pm_runtime_mark_last_busy(&client->dev);
967966
pm_runtime_put_autosuspend(&client->dev);
968967
return ret;
969968
}
@@ -985,7 +984,6 @@ static int gc2145_disable_streams(struct v4l2_subdev *sd,
985984
if (ret)
986985
dev_err(&client->dev, "%s failed to write regs\n", __func__);
987986

988-
pm_runtime_mark_last_busy(&client->dev);
989987
pm_runtime_put_autosuspend(&client->dev);
990988

991989
return ret;
@@ -1193,7 +1191,6 @@ static int gc2145_s_ctrl(struct v4l2_ctrl *ctrl)
11931191
break;
11941192
}
11951193

1196-
pm_runtime_mark_last_busy(&client->dev);
11971194
pm_runtime_put_autosuspend(&client->dev);
11981195

11991196
return ret;

‎drivers/media/i2c/imx219.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,6 @@ static int imx219_enable_streams(struct v4l2_subdev *sd,
771771
return 0;
772772

773773
err_rpm_put:
774-
pm_runtime_mark_last_busy(&client->dev);
775774
pm_runtime_put_autosuspend(&client->dev);
776775
return ret;
777776
}
@@ -793,7 +792,6 @@ static int imx219_disable_streams(struct v4l2_subdev *sd,
793792
__v4l2_ctrl_grab(imx219->vflip, false);
794793
__v4l2_ctrl_grab(imx219->hflip, false);
795794

796-
pm_runtime_mark_last_busy(&client->dev);
797795
pm_runtime_put_autosuspend(&client->dev);
798796

799797
return ret;

‎drivers/media/i2c/imx283.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,7 +1143,6 @@ static int imx283_enable_streams(struct v4l2_subdev *sd,
11431143
return 0;
11441144

11451145
err_rpm_put:
1146-
pm_runtime_mark_last_busy(imx283->dev);
11471146
pm_runtime_put_autosuspend(imx283->dev);
11481147

11491148
return ret;
@@ -1163,7 +1162,6 @@ static int imx283_disable_streams(struct v4l2_subdev *sd,
11631162
if (ret)
11641163
dev_err(imx283->dev, "Failed to stop stream\n");
11651164

1166-
pm_runtime_mark_last_busy(imx283->dev);
11671165
pm_runtime_put_autosuspend(imx283->dev);
11681166

11691167
return ret;
@@ -1558,7 +1556,6 @@ static int imx283_probe(struct i2c_client *client)
15581556
* Decrease the PM usage count. The device will get suspended after the
15591557
* autosuspend delay, turning the power off.
15601558
*/
1561-
pm_runtime_mark_last_busy(imx283->dev);
15621559
pm_runtime_put_autosuspend(imx283->dev);
15631560

15641561
return 0;

‎drivers/media/i2c/imx290.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -869,7 +869,6 @@ static int imx290_set_ctrl(struct v4l2_ctrl *ctrl)
869869
break;
870870
}
871871

872-
pm_runtime_mark_last_busy(imx290->dev);
873872
pm_runtime_put_autosuspend(imx290->dev);
874873

875874
return ret;
@@ -1099,7 +1098,6 @@ static int imx290_set_stream(struct v4l2_subdev *sd, int enable)
10991098
}
11001099
} else {
11011100
imx290_stop_streaming(imx290);
1102-
pm_runtime_mark_last_busy(imx290->dev);
11031101
pm_runtime_put_autosuspend(imx290->dev);
11041102
}
11051103

@@ -1294,7 +1292,6 @@ static int imx290_subdev_init(struct imx290 *imx290)
12941292
* will already be prevented even before the delay.
12951293
*/
12961294
v4l2_i2c_subdev_init(&imx290->sd, client, &imx290_subdev_ops);
1297-
pm_runtime_mark_last_busy(imx290->dev);
12981295
pm_runtime_put_autosuspend(imx290->dev);
12991296

13001297
imx290->sd.internal_ops = &imx290_internal_ops;

‎drivers/media/i2c/imx296.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,6 @@ static int imx296_s_stream(struct v4l2_subdev *sd, int enable)
604604
if (!enable) {
605605
ret = imx296_stream_off(sensor);
606606

607-
pm_runtime_mark_last_busy(sensor->dev);
608607
pm_runtime_put_autosuspend(sensor->dev);
609608

610609
goto unlock;

‎drivers/media/i2c/imx415.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,6 @@ static int imx415_s_stream(struct v4l2_subdev *sd, int enable)
952952
if (!enable) {
953953
ret = imx415_stream_off(sensor);
954954

955-
pm_runtime_mark_last_busy(sensor->dev);
956955
pm_runtime_put_autosuspend(sensor->dev);
957956

958957
goto unlock;

0 commit comments

Comments
 (0)