Merge branch '3.3-edac-scrubrate' into edac-for-next

diff --git a/Documentation/edac.txt b/Documentation/edac.txt
index 249822cde82bcc8609b3c459d0ad3d8b9193ff35..fdcc49fad8e11d3bb1c00b6033da3a35f33516c6 100644 (file)
--- a/Documentation/edac.txt
+++ b/Documentation/edac.txt
@@ -334,8 +334,8 @@ Sdram memory scrubbing rate:
 
        Reading the file will return the actual scrubbing rate employed.
 
-       If configuration fails or memory scrubbing is not implemented, the value
-       of the attribute file will be -1.
+       If configuration fails or memory scrubbing is not implemented, accessing
+       that attribute will fail.
 
 
 

diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index 29ffa350bfbe00281376c61c5c5c9c8434098a37..deb91fd9a2f2e0078feb9dfa0c890f4c42d608a5 100644 (file)
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -452,7 +452,7 @@ static ssize_t mci_sdram_scrub_rate_store(struct mem_ctl_info *mci,
        int new_bw = 0;
 
        if (!mci->set_sdram_scrub_rate)
-               return -EINVAL;
+               return -ENODEV;
 
        if (strict_strtoul(data, 10, &bandwidth) < 0)
                return -EINVAL;
@@ -475,7 +475,7 @@ static ssize_t mci_sdram_scrub_rate_show(struct mem_ctl_info *mci, char *data)
        int bandwidth = 0;
 
        if (!mci->get_sdram_scrub_rate)
-               return -EINVAL;
+               return -ENODEV;
 
        bandwidth = mci->get_sdram_scrub_rate(mci);
        if (bandwidth < 0) {