[PATCH] Driver core: link device and all class devices derived from it.

[linux-2.6-omap-h63xx.git] / drivers / base / core.c

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 1d8c7790b55a9b0fbdb91b2f452d749b48e51bbf..efe03a024a5bc39bf958881143d740312c3b09bc 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -39,7 +39,7 @@ dev_attr_show(struct kobject * kobj, struct attribute * attr, char * buf)
        ssize_t ret = -EIO;
 
        if (dev_attr->show)
-               ret = dev_attr->show(dev, buf);
+               ret = dev_attr->show(dev, dev_attr, buf);
        return ret;
 }
 
@@ -52,7 +52,7 @@ dev_attr_store(struct kobject * kobj, struct attribute * attr,
        ssize_t ret = -EIO;
 
        if (dev_attr->store)
-               ret = dev_attr->store(dev, buf, count);
+               ret = dev_attr->store(dev, dev_attr, buf, count);
        return ret;
 }
 
@@ -333,7 +333,7 @@ void device_del(struct device * dev)
        struct device * parent = dev->parent;
 
        if (parent)
-               klist_remove(&dev->knode_parent);
+               klist_del(&dev->knode_parent);
 
        /* Notify the platform of the removal, in case they
         * need to do anything...