Merge branches 'topic/fix/hda' and 'topic/fix/sound-core' into for-linus

[mv-sheeva.git] / drivers / uwb / beacon.c

diff --git a/drivers/uwb/beacon.c b/drivers/uwb/beacon.c
index 1ccf9eb3e08694256ed8079232de27939eaa1511..46b18eec50260789b3084df02397b2c4fd57dc38 100644 (file)
--- a/drivers/uwb/beacon.c
+++ b/drivers/uwb/beacon.c
@@ -207,7 +207,7 @@ struct uwb_beca_e *__uwb_beca_find_bymac(const struct uwb_mac_addr *mac_addr)
        struct uwb_beca_e *bce, *next;
        list_for_each_entry_safe(bce, next, &uwb_beca.list, node) {
                if (!memcmp(bce->mac_addr, mac_addr->data,
-                           sizeof(bce->mac_addr)))
+                           sizeof(struct uwb_mac_addr)))
                        goto out;
        }
        bce = NULL;
@@ -410,7 +410,6 @@ int uwbd_evt_handle_rc_beacon(struct uwb_event *evt)
        struct uwb_rc_evt_beacon *be;
        struct uwb_beacon_frame *bf;
        struct uwb_beca_e *bce;
-       struct device *dev = &evt->rc->uwb_dev.dev;
        unsigned long last_ts;
 
        rc = evt->rc;
@@ -419,14 +418,12 @@ int uwbd_evt_handle_rc_beacon(struct uwb_event *evt)
        if (result < 0)
                return result;
 
-       /* Ignore beacon if it is from an alien. */
+       /* FIXME: handle alien beacons. */
        if (be->bBeaconType == UWB_RC_BEACON_TYPE_OL_ALIEN ||
            be->bBeaconType == UWB_RC_BEACON_TYPE_NOL_ALIEN) {
-               if (printk_ratelimit())
-                       dev_err(dev, "BEACON received from ALIEN. Action? \n");
-               result = -ENOSYS;
-               return 0;
+               return -ENOSYS;
        }
+
        bf = (struct uwb_beacon_frame *) be->BeaconInfo;
 
        /*