Commit cae8b2e1 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mauro Carvalho Chehab
Browse files

media: staging: atomisp: Don't leak GPIO resources if clk_get() failed 



In case devm_clk_get() call fails the previously requested GPIOs are
left requested.

Fix this by moving GPIO request code after devm_clk_get() call.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 5fac8da5

drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c

+2 −2
Original line number Diff line number Diff line
@@ -322,8 +322,6 @@ static struct gmin_subdev *gmin_subdev_add(struct v4l2_subdev *subdev) 
							VLV2_CLK_PLL_19P2MHZ);

	gmin_subdevs[i].csi_port = gmin_get_var_int(dev, "CsiPort", 0);

	gmin_subdevs[i].csi_lanes = gmin_get_var_int(dev, "CsiLanes", 1);

	gmin_subdevs[i].gpio0 = gpiod_get_index(dev, NULL, 0, GPIOD_OUT_LOW);

	gmin_subdevs[i].gpio1 = gpiod_get_index(dev, NULL, 1, GPIOD_OUT_LOW);



	/* get PMC clock with clock framework */

	snprintf(gmin_pmc_clk_name,
@@ -356,9 +354,11 @@ static struct gmin_subdev *gmin_subdev_add(struct v4l2_subdev *subdev) 
	if (!ret)

		clk_disable_unprepare(gmin_subdevs[i].pmc_clk);



	gmin_subdevs[i].gpio0 = gpiod_get_index(dev, NULL, 0, GPIOD_OUT_LOW);

	if (IS_ERR(gmin_subdevs[i].gpio0))

		gmin_subdevs[i].gpio0 = NULL;



	gmin_subdevs[i].gpio1 = gpiod_get_index(dev, NULL, 1, GPIOD_OUT_LOW);

	if (IS_ERR(gmin_subdevs[i].gpio1))

		gmin_subdevs[i].gpio1 = NULL;