Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb

* 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
  uwb: avoid radio controller reset loops
  uwb: stop uwbd thread if rc->start() fails
  uwb: handle radio controller events with out-of-range IDs correctly

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/uwb/uwbd.c b/drivers/uwb/uwbd.c
index 57bd6bfef37e..5a777d8624da 100644
--- a/drivers/uwb/uwbd.c
+++ b/drivers/uwb/uwbd.c
@@ -187,12 +187,12 @@ int uwbd_event_handle_urc(struct uwb_event *evt)
         event = le16_to_cpu(evt->notif.rceb->wEvent);
         context = evt->notif.rceb->bEventContext;
 
-        if (type > ARRAY_SIZE(uwbd_urc_evt_type_handlers))
+        if (type >= ARRAY_SIZE(uwbd_urc_evt_type_handlers))
                 goto out;
         type_table = &uwbd_urc_evt_type_handlers[type];
         if (type_table->uwbd_events == NULL)
                 goto out;
-        if (event > type_table->size)
+        if (event >= type_table->size)
                 goto out;
         handler = type_table->uwbd_events[event].handler;
         if (handler == NULL)