diff options
author | 2012-08-22 14:21:38 -0700 | |
---|---|---|
committer | 2012-08-22 14:21:38 -0700 | |
commit | 1304a7343b30fc4f16045412efdbb4179a3d9255 (patch) | |
tree | 83d667ac4f62e30f70305ce4cc7e030e3465f92e /drivers/cpufreq/pcc-cpufreq.c | |
parent | team: add support for non-ethernet devices (diff) | |
parent | Merge branch 'akpm' (Andrew's patch-bomb) (diff) | |
download | linux-dev-1304a7343b30fc4f16045412efdbb4179a3d9255.tar.xz linux-dev-1304a7343b30fc4f16045412efdbb4179a3d9255.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/cpufreq/pcc-cpufreq.c')
-rw-r--r-- | drivers/cpufreq/pcc-cpufreq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/cpufreq/pcc-cpufreq.c b/drivers/cpufreq/pcc-cpufreq.c index cdc02ac8f41a..503996a94a6a 100644 --- a/drivers/cpufreq/pcc-cpufreq.c +++ b/drivers/cpufreq/pcc-cpufreq.c @@ -454,6 +454,7 @@ static int __init pcc_cpufreq_probe(void) mem_resource->address_length); if (pcch_virt_addr == NULL) { pr_debug("probe: could not map shared mem region\n"); + ret = -ENOMEM; goto out_free; } pcch_hdr = pcch_virt_addr; |