Merge "drm/msm/sde: fix null access for wb modes" into dev/msm-4.14-display (ab872dd5) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/gpu/drm/msm/sde/sde_wb.c

+47 −43

Original line number	Diff line number	Diff line
		@@ -178,7 +178,12 @@ int sde_wb_connector_set_modes(struct sde_wb_device *wb_dev,
		if (connected) {
		SDE_DEBUG("connect\n");

		if (count_modes && modes) {
		if (!count_modes \|\| !modes) {
		SDE_ERROR("invalid count_modes :%u and modes :%d\n",
		count_modes, !modes);
		return -EINVAL;
		}

		modeinfo = kcalloc(count_modes,
		sizeof(struct drm_mode_modeinfo),
		GFP_KERNEL);
		@@ -226,7 +231,6 @@ int sde_wb_connector_set_modes(struct sde_wb_device *wb_dev,
		goto error;
		}
		}
		}

		if (wb_dev->modes) {
		wb_dev->count_modes = 0;