Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d48ea9f authored by Shuah Khan's avatar Shuah Khan Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-mfc: fix video device release double release in probe error path 



Fix Decoder and encoder video device double release in probe error path.
video_device_release(dev->vfd_dec) get called twice if decoder register
fails. Also, video_device_release(dev->vfd_enc) get called twice if encoder
register fails.

Signed-off-by: default avatarShuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 8eb80252

drivers/media/platform/s5p-mfc/s5p_mfc.c

+0 −2
Original line number Diff line number Diff line
@@ -1266,7 +1266,6 @@ static int s5p_mfc_probe(struct platform_device *pdev) 
	ret = video_register_device(dev->vfd_dec, VFL_TYPE_GRABBER, 0);

	if (ret) {

		v4l2_err(&dev->v4l2_dev, "Failed to register video device\n");

		video_device_release(dev->vfd_dec);

		goto err_dec_reg;

	}

	v4l2_info(&dev->v4l2_dev,
@@ -1275,7 +1274,6 @@ static int s5p_mfc_probe(struct platform_device *pdev) 
	ret = video_register_device(dev->vfd_enc, VFL_TYPE_GRABBER, 0);

	if (ret) {

		v4l2_err(&dev->v4l2_dev, "Failed to register video device\n");

		video_device_release(dev->vfd_enc);

		goto err_enc_reg;

	}

	v4l2_info(&dev->v4l2_dev,