Merge "msm: mdss: Return ESHUTDOWN error when driver is shutting down" (2b860e5c) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_fb.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -2235,7 +2235,7 @@ static int mdss_fb_open(struct fb_info *info, int user)
		pr_err_once("Shutdown pending. Aborting operation. Request from pid:%d name=%s\n",
		pid, task->comm);
		sysfs_notify(&mfd->fbi->dev->kobj, NULL, "show_blank_event");
		return -EPERM;
		return -ESHUTDOWN;
		}

		file_info = kmalloc(sizeof(*file_info), GFP_KERNEL);
		@@ -2688,7 +2688,7 @@ static int mdss_fb_pan_idle(struct msm_fb_data_type *mfd)
		MDSS_XLOG_TOUT_HANDLER("mdp", "panic");
		} else if (mfd->shutdown_pending) {
		pr_debug("Shutdown signalled\n");
		return -EPERM;
		return -ESHUTDOWN;
		}

		return 0;
		@@ -2713,7 +2713,7 @@ static int mdss_fb_wait_for_kickoff(struct msm_fb_data_type *mfd)
		MDSS_XLOG_TOUT_HANDLER("mdp", "panic");
		} else if (mfd->shutdown_pending) {
		pr_debug("Shutdown signalled\n");
		return -EPERM;
		return -ESHUTDOWN;
		}

		return 0;
		@@ -3618,7 +3618,7 @@ int mdss_fb_do_ioctl(struct fb_info *info, unsigned int cmd,
		return -EINVAL;

		if (mfd->shutdown_pending)
		return -EPERM;
		return -ESHUTDOWN;

		pdata = dev_get_platdata(&mfd->pdev->dev);
		if (!pdata \|\| pdata->panel_info.dynamic_switch_pending)