diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-02-24 23:17:07 +0300 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-02-24 23:17:07 +0300 |
| commit | e11d57ca0b6dada29007ce3ad3db6c84034a768f (patch) | |
| tree | 39ad0c208e2cb3da79f958bd0e9d0d12b8e5f8fe /drivers/edac/e752x_edac.c | |
| parent | 317495b25ec1f0beb0dbac8ee0dfec59a1addf03 (diff) | |
| parent | a2c06ee2fe5b48a71e697bae00c6e7195fc016b6 (diff) | |
| download | linux-e11d57ca0b6dada29007ce3ad3db6c84034a768f.tar.xz | |
Merge remote-tracking branch 'airlied/drm-core-next' into drm-nouveau-next
Diffstat (limited to 'drivers/edac/e752x_edac.c')
| -rw-r--r-- | drivers/edac/e752x_edac.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c index 073f5a06d238..ec302d426589 100644 --- a/drivers/edac/e752x_edac.c +++ b/drivers/edac/e752x_edac.c @@ -983,11 +983,11 @@ static int set_sdram_scrub_rate(struct mem_ctl_info *mci, u32 new_bw) pci_write_config_word(pdev, E752X_MCHSCRB, scrubrates[i].scrubval); - return 0; + return scrubrates[i].bandwidth; } /* Convert current scrub rate value into byte/sec bandwidth */ -static int get_sdram_scrub_rate(struct mem_ctl_info *mci, u32 *bw) +static int get_sdram_scrub_rate(struct mem_ctl_info *mci) { const struct scrubrate *scrubrates; struct e752x_pvt *pvt = (struct e752x_pvt *) mci->pvt_info; @@ -1013,10 +1013,8 @@ static int get_sdram_scrub_rate(struct mem_ctl_info *mci, u32 *bw) "Invalid sdram scrub control value: 0x%x\n", scrubval); return -1; } + return scrubrates[i].bandwidth; - *bw = scrubrates[i].bandwidth; - - return 0; } /* Return 1 if dual channel mode is active. Else return 0. */ |