Merge branch 'linux-mfg' into tx6-mfg-devel

[karo-tx-linux.git] / drivers / edac / edac_mc_sysfs.c

diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index bf6b6802105c2c336d126adcc941180f79b9a0c4..a75acea0f674ed7ca9101ca7ce8a65e5b0961905 100644 (file)
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -248,7 +248,7 @@ static ssize_t channel_dimm_label_store(struct device *dev,
        if (data[count - 1] == '\0' || data[count - 1] == '\n')
                copy_count -= 1;
 
-       if (copy_count >= sizeof(rank->dimm->label))
+       if (copy_count == 0 || copy_count >= sizeof(rank->dimm->label))
                return -EINVAL;
 
        strncpy(rank->dimm->label, data, copy_count);
@@ -509,7 +509,7 @@ static ssize_t dimmdev_label_store(struct device *dev,
        if (data[count - 1] == '\0' || data[count - 1] == '\n')
                copy_count -= 1;
 
-       if (copy_count >= sizeof(dimm->label))
+       if (copy_count == 0 || copy_count >= sizeof(dimm->label))
                return -EINVAL;
 
        strncpy(dimm->label, data, copy_count);
@@ -976,7 +976,7 @@ void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci)
        edac_dbg(0, "\n");
 
 #ifdef CONFIG_EDAC_DEBUG
-       debugfs_remove(mci->debugfs);
+       edac_debugfs_remove_recursive(mci->debugfs);
 #endif
 #ifdef CONFIG_EDAC_LEGACY_SYSFS
        edac_delete_csrow_objects(mci);