uwb: i1480/GUWA100U: fix firmware download issues

IOGear firmware versions >= 1.4.12224 fail to be downloaded because of a
spurious (and harmless) RCEB received after the download notification. This
patch handles this RCEB and keeps compatibility with future versions that might
not emit this RCEB.

i1480_rceb_check() is reused to check for the RCEB. It is also refactored with
improved comments and reused in another place in mac.c where the checking was
being duplicated.

This patch was tested on both i1480 and GUWA100U HWAs, with all firmware
versions currently available.

Signed-off-by: Anderson Lizardo <anderson.lizardo@indt.org.br>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/uwb/i1480/dfu/mac.c b/drivers/uwb/i1480/dfu/mac.c
index 3d445541e8e9..8d069907a3b5 100644
--- a/drivers/uwb/i1480/dfu/mac.c
+++ b/drivers/uwb/i1480/dfu/mac.c
@@ -507,8 +507,8 @@ int i1480_mac_fw_upload(struct i1480 *i1480)
                 goto error_size;
         }
         result = -EIO;
-        if (rcebe->rceb.bEventType != i1480_CET_VS1
-            || le16_to_cpu(rcebe->rceb.wEvent) != i1480_EVT_RM_INIT_DONE) {
+        if (i1480_rceb_check(i1480, &rcebe->rceb, NULL, 0, i1480_CET_VS1,
+                             i1480_EVT_RM_INIT_DONE) < 0) {
                 dev_err(i1480->dev, "wrong initialization event 0x%02x/%04x/%02x "
                         "received; expected 0x%02x/%04x/00\n",
                         rcebe->rceb.bEventType, le16_to_cpu(rcebe->rceb.wEvent),