Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / edac / i5100_edac.c

diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c
index f459a6c0886b5d6545b78c61f77b70a0ce32bc4c..0448da0af75d7a39e3c6f190e0d7c9bc83f8f288 100644 (file)
--- a/drivers/edac/i5100_edac.c
+++ b/drivers/edac/i5100_edac.c
@@ -611,20 +611,17 @@ static int i5100_set_scrub_rate(struct mem_ctl_info *mci, u32 bandwidth)
 
        bandwidth = 5900000 * i5100_mc_scrben(dw);
 
-       return 0;
+       return bandwidth;
 }
 
-static int i5100_get_scrub_rate(struct mem_ctl_info *mci,
-                               u32 *bandwidth)
+static int i5100_get_scrub_rate(struct mem_ctl_info *mci)
 {
        struct i5100_priv *priv = mci->pvt_info;
        u32 dw;
 
        pci_read_config_dword(priv->mc, I5100_MC, &dw);
 
-       *bandwidth = 5900000 * i5100_mc_scrben(dw);
-
-       return 0;
+       return 5900000 * i5100_mc_scrben(dw);
 }
 
 static struct pci_dev *pci_get_device_func(unsigned vendor,