From c8db9d93c63cf2a5537f1a7bbcef3c3d09245919 Mon Sep 17 00:00:00 2001 From: David Kilroy Date: Sun, 9 Oct 2011 12:11:31 +0100 Subject: [PATCH] --- yaml --- r: 268816 b: refs/heads/master c: 1ca616711c830681faa04d5bbdaccc290a910110 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/wlags49_h2/wl_internal.h | 2 +- trunk/drivers/staging/wlags49_h2/wl_sysfs.c | 18 ++++++++++-------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 6390ecc0294d..e125ab70c4b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8122fa341d36ecacd2bc9e1b0f62594f8130b5ad +refs/heads/master: 1ca616711c830681faa04d5bbdaccc290a910110 diff --git a/trunk/drivers/staging/wlags49_h2/wl_internal.h b/trunk/drivers/staging/wlags49_h2/wl_internal.h index 6351bb8b680b..9ed28574e8a9 100644 --- a/trunk/drivers/staging/wlags49_h2/wl_internal.h +++ b/trunk/drivers/staging/wlags49_h2/wl_internal.h @@ -883,7 +883,7 @@ struct wl_private int is_registered; int is_handling_int; int firmware_present; - char sysfsCreated; + bool sysfsCreated; CFG_DRV_INFO_STRCT driverInfo; CFG_IDENTITY_STRCT driverIdentity; CFG_FW_IDENTITY_STRCT StationIdentity; diff --git a/trunk/drivers/staging/wlags49_h2/wl_sysfs.c b/trunk/drivers/staging/wlags49_h2/wl_sysfs.c index 9b833b30ae62..1508f04b3c6f 100644 --- a/trunk/drivers/staging/wlags49_h2/wl_sysfs.c +++ b/trunk/drivers/staging/wlags49_h2/wl_sysfs.c @@ -120,17 +120,19 @@ static struct attribute_group wlags_group = { void register_wlags_sysfs(struct net_device *net) { - struct device *dev = &(net->dev); - struct wl_private *lp = wl_priv(net); - - lp->sysfsCreated = sysfs_create_group(&dev->kobj, &wlags_group); + struct device *dev = &(net->dev); + struct wl_private *lp = wl_priv(net); + int err; + err = sysfs_create_group(&dev->kobj, &wlags_group); + if (!err) + lp->sysfsCreated = true; } void unregister_wlags_sysfs(struct net_device *net) { - struct device *dev = &(net->dev); - struct wl_private *lp = wl_priv(net); + struct device *dev = &(net->dev); + struct wl_private *lp = wl_priv(net); - if (lp->sysfsCreated) - sysfs_remove_group(&dev->kobj, &wlags_group); + if (lp->sysfsCreated) + sysfs_remove_group(&dev->kobj, &wlags_group); }