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

Commit d3cf695c authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

gma500: Re-order checks and dereferences in psb_intel_lvds 



Dan Carpenter reports:

Smatch complains about 6a7afe3a "gma500: continue abstracting
platform specific code"

drivers/staging/gma500/psb_intel_lvds.c +579 psb_intel_lvds_set_property(7)
	warn: variable dereferenced before check 'encoder'

	--- a/drivers/staging/gma500/psb_intel_lvds.c
	+++ b/drivers/staging/gma500/psb_intel_lvds.c
	@@ -575,11 +575,12 @@ int psb_intel_lvds_set_property(struct drm_connector *connector,
					       struct drm_property *property,
					       uint64_t value)
	 {
	-       struct drm_encoder *pEncoder = connector->encoder;
	+       struct drm_encoder *encoder = connector->encoder;
	+       struct drm_psb_private *dev_priv = encoder->dev->dev_private;
						   ^^^^^^^^^^^^
dereference encoder here.

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent fa3b1c88

drivers/staging/gma500/psb_intel_lvds.c

+9 −4
Original line number Original line Diff line number Diff line
@@ -574,9 +574,14 @@ int psb_intel_lvds_set_property(struct drm_connector *connector, 
				       uint64_t value)

				       uint64_t value)

{

{

	struct drm_encoder *encoder = connector->encoder;

	struct drm_encoder *encoder = connector->encoder;

	struct drm_psb_private *dev_priv = encoder->dev->dev_private;

	struct drm_psb_private *dev_priv;

	

	

	if (!strcmp(property->name, "scaling mode") && encoder) {

	if (!encoder)

	        return -1;



	dev_priv = encoder->dev->dev_private;



	if (!strcmp(property->name, "scaling mode")) {

		struct psb_intel_crtc *pPsbCrtc =

		struct psb_intel_crtc *pPsbCrtc =

					to_psb_intel_crtc(encoder->crtc);

					to_psb_intel_crtc(encoder->crtc);

		uint64_t curValue;

		uint64_t curValue;
@@ -617,7 +622,7 @@ int psb_intel_lvds_set_property(struct drm_connector *connector, 
						      encoder->crtc->fb))

						      encoder->crtc->fb))

				goto set_prop_error;

				goto set_prop_error;

		}

		}

	} else if (!strcmp(property->name, "backlight") && encoder) {

	} else if (!strcmp(property->name, "backlight")) {

		if (drm_connector_property_set_value(connector,

		if (drm_connector_property_set_value(connector,

							property,

							property,

							value))

							value))
@@ -631,7 +636,7 @@ int psb_intel_lvds_set_property(struct drm_connector *connector, 
                        }

                        }

#endif

#endif

		}

		}

	} else if (!strcmp(property->name, "DPMS") && encoder) {

	} else if (!strcmp(property->name, "DPMS")) {

		struct drm_encoder_helper_funcs *pEncHFuncs

		struct drm_encoder_helper_funcs *pEncHFuncs

						= encoder->helper_private;

						= encoder->helper_private;

		pEncHFuncs->dpms(encoder, value);

		pEncHFuncs->dpms(encoder, value);