From: Dan Carpenter Date: Mon, 17 Aug 2015 14:37:03 +0000 (+0300) Subject: drm/tegra: checking for IS_ERR() instead of NULL X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=db8b42fbfc6f778fa22201f24e53fc4250b52e4c;p=openwrt%2Fstaging%2Fblogic.git drm/tegra: checking for IS_ERR() instead of NULL The tegra_sor_hdmi_find_settings() function returns NULL on error and not an ERR_PTR. Fixes: 459cc2c6800b ('drm/tegra: sor: Add HDMI support') Signed-off-by: Dan Carpenter Signed-off-by: Thierry Reding --- diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index 17e008f6081f..a5fddd3d06a9 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -1946,9 +1946,9 @@ static void tegra_sor_hdmi_enable(struct drm_encoder *encoder) /* production settings */ settings = tegra_sor_hdmi_find_settings(sor, mode->clock * 1000); - if (IS_ERR(settings)) { - dev_err(sor->dev, "no settings for pixel clock %d Hz: %ld\n", - mode->clock * 1000, PTR_ERR(settings)); + if (!settings) { + dev_err(sor->dev, "no settings for pixel clock %d Hz\n", + mode->clock * 1000); return; }