Commit aeae3db1 authored by Tony Prisk's avatar Tony Prisk Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-tv: Fix incorrect usage of IS_ERR_OR_NULL 



Replace IS_ERR_OR_NULL with IS_ERR on clk_get results.

Signed-off-by: default avatarTony Prisk <linux@prisktech.co.nz>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent cf48f56c

drivers/media/platform/s5p-tv/hdmi_drv.c

+5 −5
Original line number Diff line number Diff line
@@ -781,27 +781,27 @@ static int hdmi_resources_init(struct hdmi_device *hdev) 
	/* get clocks, power */



	res->hdmi = clk_get(dev, "hdmi");

	if (IS_ERR_OR_NULL(res->hdmi)) {

	if (IS_ERR(res->hdmi)) {

		dev_err(dev, "failed to get clock 'hdmi'\n");

		goto fail;

	}

	res->sclk_hdmi = clk_get(dev, "sclk_hdmi");

	if (IS_ERR_OR_NULL(res->sclk_hdmi)) {

	if (IS_ERR(res->sclk_hdmi)) {

		dev_err(dev, "failed to get clock 'sclk_hdmi'\n");

		goto fail;

	}

	res->sclk_pixel = clk_get(dev, "sclk_pixel");

	if (IS_ERR_OR_NULL(res->sclk_pixel)) {

	if (IS_ERR(res->sclk_pixel)) {

		dev_err(dev, "failed to get clock 'sclk_pixel'\n");

		goto fail;

	}

	res->sclk_hdmiphy = clk_get(dev, "sclk_hdmiphy");

	if (IS_ERR_OR_NULL(res->sclk_hdmiphy)) {

	if (IS_ERR(res->sclk_hdmiphy)) {

		dev_err(dev, "failed to get clock 'sclk_hdmiphy'\n");

		goto fail;

	}

	res->hdmiphy = clk_get(dev, "hdmiphy");

	if (IS_ERR_OR_NULL(res->hdmiphy)) {

	if (IS_ERR(res->hdmiphy)) {

		dev_err(dev, "failed to get clock 'hdmiphy'\n");

		goto fail;

	}

drivers/media/platform/s5p-tv/mixer_drv.c

+5 −5
Original line number Diff line number Diff line
@@ -240,27 +240,27 @@ static int mxr_acquire_clocks(struct mxr_device *mdev) 
	struct device *dev = mdev->dev;



	res->mixer = clk_get(dev, "mixer");

	if (IS_ERR_OR_NULL(res->mixer)) {

	if (IS_ERR(res->mixer)) {

		mxr_err(mdev, "failed to get clock 'mixer'\n");

		goto fail;

	}

	res->vp = clk_get(dev, "vp");

	if (IS_ERR_OR_NULL(res->vp)) {

	if (IS_ERR(res->vp)) {

		mxr_err(mdev, "failed to get clock 'vp'\n");

		goto fail;

	}

	res->sclk_mixer = clk_get(dev, "sclk_mixer");

	if (IS_ERR_OR_NULL(res->sclk_mixer)) {

	if (IS_ERR(res->sclk_mixer)) {

		mxr_err(mdev, "failed to get clock 'sclk_mixer'\n");

		goto fail;

	}

	res->sclk_hdmi = clk_get(dev, "sclk_hdmi");

	if (IS_ERR_OR_NULL(res->sclk_hdmi)) {

	if (IS_ERR(res->sclk_hdmi)) {

		mxr_err(mdev, "failed to get clock 'sclk_hdmi'\n");

		goto fail;

	}

	res->sclk_dac = clk_get(dev, "sclk_dac");

	if (IS_ERR_OR_NULL(res->sclk_dac)) {

	if (IS_ERR(res->sclk_dac)) {

		mxr_err(mdev, "failed to get clock 'sclk_dac'\n");

		goto fail;

	}