Merge tag 'metag-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan...

[deliverable/linux.git] / drivers / uwb / pal.c

diff --git a/drivers/uwb/pal.c b/drivers/uwb/pal.c
index 690577d2a35bf3494f3e9886c7f9ca4fd21fb17c..c1304b8d498530124c7ca30319c12cc823e84d6e 100644 (file)
--- a/drivers/uwb/pal.c
+++ b/drivers/uwb/pal.c
@@ -68,8 +68,40 @@ int uwb_pal_register(struct uwb_pal *pal)
 }
 EXPORT_SYMBOL_GPL(uwb_pal_register);
 
+static int find_rc(struct device *dev, const void *data)
+{
+       const struct uwb_rc *target_rc = data;
+       struct uwb_rc *rc = dev_get_drvdata(dev);
+
+       if (rc == NULL) {
+               WARN_ON(1);
+               return 0;
+       }
+       if (rc == target_rc) {
+               if (rc->ready == 0)
+                       return 0;
+               else
+                       return 1;
+       }
+       return 0;
+}
+
+/**
+ * Given a radio controller descriptor see if it is registered.
+ *
+ * @returns false if the rc does not exist or is quiescing; true otherwise.
+ */
+static bool uwb_rc_class_device_exists(struct uwb_rc *target_rc)
+{
+       struct device *dev;
+
+       dev = class_find_device(&uwb_rc_class, NULL, target_rc, find_rc);
+
+       return (dev != NULL);
+}
+
 /**
- * uwb_pal_register - unregister a UWB PAL
+ * uwb_pal_unregister - unregister a UWB PAL
  * @pal: the PAL
  */
 void uwb_pal_unregister(struct uwb_pal *pal)
@@ -85,7 +117,11 @@ void uwb_pal_unregister(struct uwb_pal *pal)
        debugfs_remove(pal->debugfs_dir);
 
        if (pal->device) {
-               sysfs_remove_link(&rc->uwb_dev.dev.kobj, pal->name);
+               /* remove link to the PAL in the UWB device's directory. */
+               if (uwb_rc_class_device_exists(rc))
+                       sysfs_remove_link(&rc->uwb_dev.dev.kobj, pal->name);
+
+               /* remove link to uwb_rc in the PAL device's directory. */
                sysfs_remove_link(&pal->device->kobj, "uwb_rc");
        }
 }