redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

mmc: sdhci-pci: Allow for 3 bytes from Intel DSM

Browse source 
The DSM used by some Intel controllers can return a 3 byte package. Allow
for that by using memcpy to copy the bytes.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Adrian Hunter 2017-04-19 15:48:55 +03:00 committed by Ulf Hansson
parent 3fcc78340f
commit a72016a447
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/mmc/host/sdhci-pci-core.c
View file

@ -12,6 +12,7 @@
* - JMicron (hardware and technical support) * - JMicron (hardware and technical support)
*/ */
#include <linux/string.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/highmem.h> #include <linux/highmem.h>
#include <linux/module.h> #include <linux/module.h>
@ -413,6 +414,7 @@ static int __intel_dsm(struct intel_host *intel_host, struct device *dev,
{ {
union acpi_object *obj; union acpi_object *obj;
int err = 0; int err = 0;
size_t len;
obj = acpi_evaluate_dsm(ACPI_HANDLE(dev), intel_dsm_uuid, 0, fn, NULL); obj = acpi_evaluate_dsm(ACPI_HANDLE(dev), intel_dsm_uuid, 0, fn, NULL);
if (!obj) if (!obj)
@ -423,12 +425,10 @@ static int __intel_dsm(struct intel_host *intel_host, struct device *dev,
goto out; goto out;
} }
if (obj->buffer.length >= 4) len = min_t(size_t, obj->buffer.length, 4);
*result = *(u32 *)obj->buffer.pointer;
else if (obj->buffer.length >= 2) *result = 0;
*result = *(u16 *)obj->buffer.pointer; memcpy(result, obj->buffer.pointer, len);
else
*result = *(u8 *)obj->buffer.pointer;
out: out:
ACPI_FREE(obj); ACPI_FREE(obj);