diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2012-01-04 00:19:24 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2012-01-04 00:19:24 +0000 |
| commit | eb488ac792981ca02a05ced5416bb657d8927bde (patch) | |
| tree | 503f88422aa0940ef11120e503977d0c2ba03018 /firmware/target/hosted | |
| parent | d6db4cc105819f004fbb2207d511f1ae8889c9af (diff) | |
| download | rockbox-eb488ac792981ca02a05ced5416bb657d8927bde.tar.gz rockbox-eb488ac792981ca02a05ced5416bb657d8927bde.zip | |
Fix intermittent warning on sdl app build.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31553 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/hosted')
| -rw-r--r-- | firmware/target/hosted/cpuinfo-linux.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/firmware/target/hosted/cpuinfo-linux.c b/firmware/target/hosted/cpuinfo-linux.c index 373d1c742e..e5278cec19 100644 --- a/firmware/target/hosted/cpuinfo-linux.c +++ b/firmware/target/hosted/cpuinfo-linux.c @@ -141,13 +141,13 @@ int cpufrequency_linux(int cpu) { char path[64]; char temp[10]; - int cpu_dev, ret; + int cpu_dev, ret = -1; snprintf(path, sizeof(path), "/sys/devices/system/cpu/cpu%d/cpufreq/cpuinfo_cur_freq", cpu); cpu_dev = open(path, O_RDONLY); if (cpu_dev < 0) return -1; - read(cpu_dev, temp, 10); - ret = atoi(temp); + if (read(cpu_dev, temp, sizeof(tmp)) >= 0) + ret = atoi(temp); close(cpu_dev); return ret; } @@ -156,13 +156,13 @@ int scalingfrequency_linux(int cpu) { char path[64]; char temp[10]; - int cpu_dev, ret; + int cpu_dev, ret = -1; snprintf(path, sizeof(path), "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_cur_freq", cpu); cpu_dev = open(path, O_RDONLY); if (cpu_dev < 0) return -1; - read(cpu_dev, temp, 10); - ret = atoi(temp); + if (read(cpu_dev, temp, sizeof(tmp)) >= 0) + ret = atoi(temp); close(cpu_dev); return ret; } |