diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-05-28 08:37:19 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-05-28 08:37:19 -0700 |
| commit | 24cedeb24492e76bb8f75c8532c76fe700ff4775 (patch) | |
| tree | e829dbbc4aa9acfb18713d6bf90de86ccd6a6a10 /drivers/platform | |
| parent | 2f6ef8a30b780f020b67bf1be17e1949881f8b02 (diff) | |
| parent | 780ec0d562724e68ed866498dedc7c2ef229609f (diff) | |
Merge "Merge android-4.4.180 (71cb827) into msm-4.4"
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/sony-laptop.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index f73c29558cd3..c54ff94c491d 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c @@ -4394,14 +4394,16 @@ sony_pic_read_possible_resource(struct acpi_resource *resource, void *context) } return AE_OK; } + + case ACPI_RESOURCE_TYPE_END_TAG: + return AE_OK; + default: dprintk("Resource %d isn't an IRQ nor an IO port\n", resource->type); + return AE_CTRL_TERMINATE; - case ACPI_RESOURCE_TYPE_END_TAG: - return AE_OK; } - return AE_CTRL_TERMINATE; } static int sony_pic_possible_resources(struct acpi_device *device) |