From 9024b731ba2a9438a6f2f4dbd5f44c47d9b67ea4 Mon Sep 17 00:00:00 2001 From: Goldwyn Rodrigues Date: Mon, 4 Jul 2011 09:26:57 -0700 Subject: [PATCH] --- yaml --- r: 254289 b: refs/heads/master c: b2bc4782191cb574924a1d09f48083ea8b33a93b h: refs/heads/master i: 254287: 6097187445e7e2fcbf049977639745872bee2663 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/core/cm.c | 3 ++- trunk/drivers/infiniband/core/uverbs_main.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d50687c79684..88b53ac8f45d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba466c74d99b91b2f390a09ad31bbc6cddd8cf4b +refs/heads/master: b2bc4782191cb574924a1d09f48083ea8b33a93b diff --git a/trunk/drivers/infiniband/core/cm.c b/trunk/drivers/infiniband/core/cm.c index f62f52fb9ece..fc0f2bd9ca82 100644 --- a/trunk/drivers/infiniband/core/cm.c +++ b/trunk/drivers/infiniband/core/cm.c @@ -3641,7 +3641,8 @@ static struct kobj_type cm_port_obj_type = { static char *cm_devnode(struct device *dev, mode_t *mode) { - *mode = 0666; + if (mode) + *mode = 0666; return kasprintf(GFP_KERNEL, "infiniband/%s", dev_name(dev)); } diff --git a/trunk/drivers/infiniband/core/uverbs_main.c b/trunk/drivers/infiniband/core/uverbs_main.c index e49a85f8a44d..56898b6578a4 100644 --- a/trunk/drivers/infiniband/core/uverbs_main.c +++ b/trunk/drivers/infiniband/core/uverbs_main.c @@ -826,7 +826,8 @@ static void ib_uverbs_remove_one(struct ib_device *device) static char *uverbs_devnode(struct device *dev, mode_t *mode) { - *mode = 0666; + if (mode) + *mode = 0666; return kasprintf(GFP_KERNEL, "infiniband/%s", dev_name(dev)); }