Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 21:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

acpi, nfit: fix extended status translations for ACPI DSMs

Browse Source 
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:
Vishal Verma 2016-12-05 17:00:37 -07:00 committed by Dan Williams
parent 3e5de27e94
commit 9a901f5495
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/acpi/nfit/core.c
View File

@ -113,7 +113,7 @@ static int xlat_status(void *buf, unsigned int cmd, u32 status)
flags = ND_ARS_PERSISTENT | ND_ARS_VOLATILE; flags = ND_ARS_PERSISTENT | ND_ARS_VOLATILE;
if ((status >> 16 & flags) == 0) if ((status >> 16 & flags) == 0)
return -ENOTTY; return -ENOTTY;
break; return 0;
case ND_CMD_ARS_START: case ND_CMD_ARS_START:
/* ARS is in progress */ /* ARS is in progress */
if ((status & 0xffff) == NFIT_ARS_START_BUSY) if ((status & 0xffff) == NFIT_ARS_START_BUSY)
@ -122,7 +122,7 @@ static int xlat_status(void *buf, unsigned int cmd, u32 status)
/* Command failed */ /* Command failed */
if (status & 0xffff) if (status & 0xffff)
return -EIO; return -EIO;
break; return 0;
case ND_CMD_ARS_STATUS: case ND_CMD_ARS_STATUS:
ars_status = buf; ars_status = buf;
/* Command failed */ /* Command failed */
@ -154,7 +154,7 @@ static int xlat_status(void *buf, unsigned int cmd, u32 status)
/* Unknown status */ /* Unknown status */
if (status >> 16) if (status >> 16)
return -EIO; return -EIO;
break; return 0;
case ND_CMD_CLEAR_ERROR: case ND_CMD_CLEAR_ERROR:
clear_err = buf; clear_err = buf;
if (status & 0xffff) if (status & 0xffff)
@ -163,7 +163,7 @@ static int xlat_status(void *buf, unsigned int cmd, u32 status)
return -EIO; return -EIO;
if (clear_err->length > clear_err->cleared) if (clear_err->length > clear_err->cleared)
return clear_err->cleared; return clear_err->cleared;
break; return 0;
default: default:
break; break;
} }