diff options
author | Sven Eckelmann <sven.eckelmann@gmx.de> | 2010-08-09 23:56:38 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-23 18:15:35 -0700 |
commit | 466122df80e447883588ffcf9d21b88152934819 (patch) | |
tree | c04090e00c5b0e367e40db29ed266eddad42e942 /drivers/staging/batman-adv/bat_sysfs.c | |
parent | 49b48547724eca062aec13a3bfd621194836513b (diff) | |
download | op-kernel-dev-466122df80e447883588ffcf9d21b88152934819.zip op-kernel-dev-466122df80e447883588ffcf9d21b88152934819.tar.gz |
Staging: batman-adv: Fix merge of linus tree
Greg Kroah-Hartman merged Linus 2.6.36 tree in
e9563355ac1175dd3440dc2ea5c28b27ed51a283 with his staging tree.
Different parts of the merge conflicts were resolved incorrectly and may
result in an abnormal behavior.
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/batman-adv/bat_sysfs.c')
-rw-r--r-- | drivers/staging/batman-adv/bat_sysfs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/staging/batman-adv/bat_sysfs.c b/drivers/staging/batman-adv/bat_sysfs.c index b4a8d5e..05ca15a 100644 --- a/drivers/staging/batman-adv/bat_sysfs.c +++ b/drivers/staging/batman-adv/bat_sysfs.c @@ -267,6 +267,10 @@ static ssize_t store_log_level(struct kobject *kobj, struct attribute *attr, if (atomic_read(&bat_priv->log_level) == log_level_tmp) return count; + bat_info(net_dev, "Changing log level from: %i to: %li\n", + atomic_read(&bat_priv->log_level), + log_level_tmp); + atomic_set(&bat_priv->log_level, (unsigned)log_level_tmp); return count; } |