acpi, nfit: fix extended status translations for ACPI DSMs
ACPI DSMs can have an 'extended' status which can be non-zero to convey
additional information about the command. In the xlat_status routine,
where we translate the command statuses, we were returning an error for
a non-zero extended status, even if the primary status indicated success.
Return from each command's 'case' once we have verified both its status
and extend status are good.
Cc: <stable@vger.kernel.org>
Fixes: 11294d63ac
("nfit: fail DSMs that return non-zero status by default")
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Родитель
3e5de27e94
Коммит
9a901f5495
|
@ -113,7 +113,7 @@ static int xlat_status(void *buf, unsigned int cmd, u32 status)
|
|||
flags = ND_ARS_PERSISTENT | ND_ARS_VOLATILE;
|
||||
if ((status >> 16 & flags) == 0)
|
||||
return -ENOTTY;
|
||||
break;
|
||||
return 0;
|
||||
case ND_CMD_ARS_START:
|
||||
/* ARS is in progress */
|
||||
if ((status & 0xffff) == NFIT_ARS_START_BUSY)
|
||||
|
@ -122,7 +122,7 @@ static int xlat_status(void *buf, unsigned int cmd, u32 status)
|
|||
/* Command failed */
|
||||
if (status & 0xffff)
|
||||
return -EIO;
|
||||
break;
|
||||
return 0;
|
||||
case ND_CMD_ARS_STATUS:
|
||||
ars_status = buf;
|
||||
/* Command failed */
|
||||
|
@ -154,7 +154,7 @@ static int xlat_status(void *buf, unsigned int cmd, u32 status)
|
|||
/* Unknown status */
|
||||
if (status >> 16)
|
||||
return -EIO;
|
||||
break;
|
||||
return 0;
|
||||
case ND_CMD_CLEAR_ERROR:
|
||||
clear_err = buf;
|
||||
if (status & 0xffff)
|
||||
|
@ -163,7 +163,7 @@ static int xlat_status(void *buf, unsigned int cmd, u32 status)
|
|||
return -EIO;
|
||||
if (clear_err->length > clear_err->cleared)
|
||||
return clear_err->cleared;
|
||||
break;
|
||||
return 0;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче