Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[firefly-linux-kernel-4.4.55.git] / drivers / uwb / est.c

diff --git a/drivers/uwb/est.c b/drivers/uwb/est.c
index 457f31d99bf42d4cbd9240f6a6b450a298fdd1e2..f3e232584284a906309247e5ed5f3c0fef54e472 100644 (file)
--- a/drivers/uwb/est.c
+++ b/drivers/uwb/est.c
@@ -258,7 +258,6 @@ int uwb_est_register(u8 type, u8 event_high, u16 vendor, u16 product,
 {
        unsigned long flags;
        unsigned itr;
-       u16 type_event_high;
        int result = 0;
 
        write_lock_irqsave(&uwb_est_lock, flags);
@@ -268,7 +267,6 @@ int uwb_est_register(u8 type, u8 event_high, u16 vendor, u16 product,
                        goto out;
        }
        /* Find the right spot to insert it in */
-       type_event_high = type << 8 | event_high;
        for (itr = 0; itr < uwb_est_used; itr++)
                if (uwb_est[itr].type_event_high < type
                    && uwb_est[itr].vendor < vendor