Merge commit 'athcx/master'

diff --combined osl.c
index 1179307c1d21ddf0c3d9bb0731ea1fcb3cc700c8,16b3af5ecee2ed3cfa2abacc2cd1756cc2646e7a..50f63983bb26cc0b0511b497ba7203df64da659c
--- 1/osl.c
--- 2/osl.c
+++ b/osl.c
@@@ -194,6 -194,7 +194,6 @@@ static int init_column_descriptions(str
        int i, j, ret;
        const struct osl_column_description *cd;
  
 -      ret = -E_OSL_BAD_TABLE_DESC;
        ret = verify_name(t->desc->name);
        if (ret < 0)
                goto err;
@@@ -765,6 -766,10 +765,10 @@@ int get_mapped_object(const struct osl_
        return 1;
  }
  
+ /*
+  * It's OK to call this with result = rb_node = NULL.  If result is not NULL,
+  * and rb key was not found, result points to the parent node.
+  */
  static int search_rbtree(const struct osl_object *obj,
                const struct osl_table *t, unsigned col_num,
                struct rb_node **result, struct rb_node ***rb_link)