]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
usb: typec: ucsi: huawei_gaokun: add error checking
authorPengyu Luo <mitltlatltl@gmail.com>
Tue, 15 Apr 2025 17:20:05 +0000 (01:20 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 25 Apr 2025 11:20:48 +0000 (13:20 +0200)
'cci' may be uninitialized, adding error checking to fix it.

Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/all/Z_44zoTyLLdXNkKT@stanley.mountain
Fixes: 00327d7f2c8c ("usb: typec: ucsi: add Huawei Matebook E Go ucsi driver")
Signed-off-by: Pengyu Luo <mitltlatltl@gmail.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20250415172006.126740-1-mitltlatltl@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/typec/ucsi/ucsi_huawei_gaokun.c

index 344aa7aeaf021e06992ac9c4b0feeb2ed659ccaa..7b5222081bbb54c5637ce165391ac78136d33cec 100644 (file)
@@ -359,6 +359,7 @@ static int gaokun_ucsi_notify(struct notifier_block *nb,
                              unsigned long action, void *data)
 {
        u32 cci;
+       int ret;
        struct gaokun_ucsi *uec = container_of(nb, struct gaokun_ucsi, nb);
 
        switch (action) {
@@ -368,7 +369,10 @@ static int gaokun_ucsi_notify(struct notifier_block *nb,
                return NOTIFY_OK;
 
        case EC_EVENT_UCSI:
-               gaokun_ucsi_read_cci(uec->ucsi, &cci);
+               ret = gaokun_ucsi_read_cci(uec->ucsi, &cci);
+               if (ret)
+                       return NOTIFY_DONE;
+
                ucsi_notify_common(uec->ucsi, cci);
                if (UCSI_CCI_CONNECTOR(cci))
                        gaokun_ucsi_handle_no_usb_event(uec, UCSI_CCI_CONNECTOR(cci) - 1);