Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 (5eb38f44) · Commits · e / devices / android_kernel_teracube_2e

arch/arm/mach-pxa/sharpsl_pm.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -678,8 +678,8 @@ static int corgi_enter_suspend(unsigned long alarm_time, unsigned int alarm_enab
		dev_dbg(sharpsl_pm.dev, "User triggered wakeup in offline charger.\n");
		}

		if ((!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_LOCK)) \|\| (sharpsl_fatal_check() < 0) )
		{
		if ((!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_LOCK)) \|\|
		(!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_FATAL))) {
		dev_err(sharpsl_pm.dev, "Fatal condition. Suspend.\n");
		corgi_goto_sleep(alarm_time, alarm_enable, state);
		return 1;