adb reboot reboots in MOS

BZ: 38390

Modification of logic for making "adb reboot" always go to MOS.

Now we have :
- adb reboot recovery => RECOVERY
- adb reboot bootloader => FASTBOOT
- adb reboot <any other parameter, or no parameter> => MOS

Change-Id: I9ac6f3ca504680a5fbaa9c062b781ccda8d1921c
Signed-off-by: Guillaume Betous <guillaumeX.betous@intel.com>
Reviewed-on: http://android.intel.com:8080/50157
Reviewed-by: Castelain, DavidX <davidx.castelain@intel.com>
Reviewed-by: Afantenos, Marie CecileX <marie.cecilex.afantenos@intel.com>
Reviewed-by: Sahukar, Surya P <surya.p.sahukar@intel.com>
Tested-by: Afantenos, Marie CecileX <marie.cecilex.afantenos@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

diff --git a/drivers/platform/x86/intel_mid_osip.c b/drivers/platform/x86/intel_mid_osip.c
index 1659e51..bbe1354 100644 (file)
--- a/drivers/platform/x86/intel_mid_osip.c
+++ b/drivers/platform/x86/intel_mid_osip.c
@@ -275,7 +275,7 @@ static int osip_reboot_notifier_call(struct notifier_block *notifier,
                        pr_err("%s cannot write reboot reason in OSNIB\n",
                                __func__);
                ret = NOTIFY_OK;
-       } else if (0 == strncmp(cmd, "android", 8)) {
+       } else {
                pr_warn("[SHTDWN] %s, restoring OSIP and rebooting into "
                        "Android\n", __func__);
                ret_ipc = intel_scu_ipc_write_osnib_rr(SIGNED_MOS_ATTR);
@@ -284,8 +284,6 @@ static int osip_reboot_notifier_call(struct notifier_block *notifier,
                                 __func__);
                access_osip_record(osip_restore, (void *)0);
                ret = NOTIFY_OK;
-       } else {
-               pr_warn("[SHTDWN] %s, rebooting\n", __func__);
        }
        return ret;
 }