lib/libcrc32c.c: use PTR_ERR_OR_ZERO

[linux-2.6-microblaze.git] / drivers / uwb / beacon.c

diff --git a/drivers/uwb/beacon.c b/drivers/uwb/beacon.c
index 57b5ff6..f40745f 100644 (file)
--- a/drivers/uwb/beacon.c
+++ b/drivers/uwb/beacon.c
@@ -125,8 +125,10 @@ int uwb_rc_beacon(struct uwb_rc *rc, int channel, unsigned bpst_offset)
        else {
                /* channel >= 0...dah */
                result = uwb_rc_start_beacon(rc, bpst_offset, channel);
-               if (result < 0)
+               if (result < 0) {
+                       dev_err(dev, "Cannot start beaconing: %d\n", result);
                        return result;
+               }
                if (le16_to_cpu(rc->ies->wIELength) > 0) {
                        result = uwb_rc_set_ie(rc, rc->ies);
                        if (result < 0) {
@@ -395,7 +397,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;
-       unsigned long last_ts;
 
        rc = evt->rc;
        be = container_of(evt->notif.rceb, struct uwb_rc_evt_beacon, rceb);
@@ -439,8 +440,6 @@ int uwbd_evt_handle_rc_beacon(struct uwb_event *evt)
        /* purge old beacon data */
        kfree(bce->be);
 
-       last_ts = bce->ts_jiffies;
-
        /* Update commonly used fields */
        bce->ts_jiffies = evt->ts_jiffies;
        bce->be = be;