1 files changed, 5 insertions, 4 deletions

diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index d0e3d8495165..5e83e7246788 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -301,9 +301,8 @@ static int check_perm(struct inode * inode, struct file * file)
         /* No error? Great, allocate a buffer for the file, and store it
          * it in file->private_data for easy access.
          */
-        buffer = kmalloc(sizeof(struct sysfs_buffer),GFP_KERNEL);
+        buffer = kzalloc(sizeof(struct sysfs_buffer), GFP_KERNEL);
         if (buffer) {
-                memset(buffer,0,sizeof(struct sysfs_buffer));
                 init_MUTEX(&buffer->sem);
                 buffer->needs_read_fill = 1;
                 buffer->ops = ops;
@@ -362,10 +361,12 @@ int sysfs_add_file(struct dentry * dir, const struct attribute * attr, int type)
 {
         struct sysfs_dirent * parent_sd = dir->d_fsdata;
         umode_t mode = (attr->mode & S_IALLUGO) | S_IFREG;
-        int error = 0;
+        int error = -EEXIST;
 
         mutex_lock(&dir->d_inode->i_mutex);
-        error = sysfs_make_dirent(parent_sd, NULL, (void *) attr, mode, type);
+        if (!sysfs_dirent_exist(parent_sd, attr->name))
+                error = sysfs_make_dirent(parent_sd, NULL, (void *)attr,
+                                          mode, type);
         mutex_unlock(&dir->d_inode->i_mutex);
 
         return error;