[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20170704112733.7e19d4c4@canb.auug.org.au>
Date: Tue, 4 Jul 2017 11:27:33 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <gregkh@...uxfoundation.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>,
Andrew Morton <akpm@...ux-foundation.org>,
linux-kernel@...r.kernel.org, linux-usb@...r.kernel.org
Subject: Re: [GIT PULL] USB/PHY patches for 4.13-rc1
Hi all,
On Mon, 3 Jul 2017 16:58:47 +0200 Greg KH <gregkh@...uxfoundation.org> wrote:
>
> All of these have been in linux-next for a while with no reported
> issues.
I have been carrying the following merge fix patch for the merge
against the uuid tree (now in Linus' tree):
From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Thu, 29 Jun 2017 14:36:10 +1000
Subject: [PATCH] usb: typec: fix for "ACPI: Switch to use generic guid_t in
acpi_evaluate_dsm()"
Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
drivers/usb/typec/ucsi/ucsi_acpi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/typec/ucsi/ucsi_acpi.c b/drivers/usb/typec/ucsi/ucsi_acpi.c
index 3fb2e48e1c91..7b7c9373a9b6 100644
--- a/drivers/usb/typec/ucsi/ucsi_acpi.c
+++ b/drivers/usb/typec/ucsi/ucsi_acpi.c
@@ -23,14 +23,14 @@ struct ucsi_acpi {
struct device *dev;
struct ucsi *ucsi;
struct ucsi_ppm ppm;
- uuid_le uuid;
+ guid_t uuid;
};
static int ucsi_acpi_dsm(struct ucsi_acpi *ua, int func)
{
union acpi_object *obj;
- obj = acpi_evaluate_dsm(ACPI_HANDLE(ua->dev), ua->uuid.b, 1, func,
+ obj = acpi_evaluate_dsm(ACPI_HANDLE(ua->dev), &ua->uuid, 1, func,
NULL);
if (!obj) {
dev_err(ua->dev, "%s: failed to evaluate _DSM %d\n",
--
2.11.0
--
Cheers,
Stephen Rothwell
Powered by blists - more mailing lists