Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt

[linux-2.6-omap-h63xx.git] / drivers / isdn / gigaset / proc.c

diff --git a/drivers/isdn/gigaset/proc.c b/drivers/isdn/gigaset/proc.c
index d267a636b53c63cbd9558b73e57474248d5f9a16..da6f3acf9fd05f23999a652b24ce0799aa575ca4 100644 (file)
--- a/drivers/isdn/gigaset/proc.c
+++ b/drivers/isdn/gigaset/proc.c
@@ -16,18 +16,12 @@
 #include "gigaset.h"
 #include <linux/ctype.h>
 
-static ssize_t show_cidmode(struct device *dev, struct device_attribute *attr,
-                           char *buf)
+static ssize_t show_cidmode(struct device *dev,
+                           struct device_attribute *attr, char *buf)
 {
-       int ret;
-       unsigned long flags;
        struct cardstate *cs = dev_get_drvdata(dev);
 
-       spin_lock_irqsave(&cs->lock, flags);
-       ret = sprintf(buf, "%u\n", cs->cidmode);
-       spin_unlock_irqrestore(&cs->lock, flags);
-
-       return ret;
+       return sprintf(buf, "%u\n", cs->cidmode);
 }
 
 static ssize_t set_cidmode(struct device *dev, struct device_attribute *attr,
@@ -70,13 +64,20 @@ static DEVICE_ATTR(cidmode, S_IRUGO|S_IWUSR, show_cidmode, set_cidmode);
 /* free sysfs for device */
 void gigaset_free_dev_sysfs(struct cardstate *cs)
 {
+       if (!cs->tty_dev)
+               return;
+
        gig_dbg(DEBUG_INIT, "removing sysfs entries");
-       device_remove_file(cs->dev, &dev_attr_cidmode);
+       device_remove_file(cs->tty_dev, &dev_attr_cidmode);
 }
 
 /* initialize sysfs for device */
 void gigaset_init_dev_sysfs(struct cardstate *cs)
 {
+       if (!cs->tty_dev)
+               return;
+
        gig_dbg(DEBUG_INIT, "setting up sysfs");
-       device_create_file(cs->dev, &dev_attr_cidmode);
+       if (device_create_file(cs->tty_dev, &dev_attr_cidmode))
+               dev_err(cs->dev, "could not create sysfs attribute\n");
 }