projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 67e2c37)
usb: typec: Fix enum conversion warning
authorTimi Rautamäki <timi.rautamaki@gmail.com>
Mon, 6 Dec 2021 18:00:27 +0000 (18:00 +0000)
committerNolen Johnson <johnsonnolen@gmail.com>
Tue, 21 Dec 2021 18:35:25 +0000 (13:35 -0500)
Change-Id: Id61b8673915551bfa6ce81058bea066312b16345

drivers/usb/typec/tcpm.c patch | blob | blame | history

diff --git a/drivers/usb/typec/tcpm.c b/drivers/usb/typec/tcpm.c
index 977491c5a986a1b4dcb33dcf01ec2886c7caebff..41c394e0c9bfa433ed03e96b3c1a6d1f7e4f1cfd 100644 (file)
--- a/drivers/usb/typec/tcpm.c
+++ b/drivers/usb/typec/tcpm.c
@@ -4638,7 +4638,7 @@ static int tcpm_psy_get_current_max(struct tcpm_port *port,
        if (port->pps_data.active)
                val->intval = port->pps_data.max_curr * 1000;
        else
-               val->intval = max(tcpm_get_max_fixed_current(port),
+               val->intval = max_t(size_t, tcpm_get_max_fixed_current(port),
                                  port->current_limit) * 1000;
 
        return 0;