mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of 109.75.98.228:cst-private-neutrino into next

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 752f404654
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-04 (Mon, 04 Feb 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2013-02-04 11:02:51 +04:00
parent 1a7de96560 bd7776cc70
commit 9c58bf77fc
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/system/setting_helpers.cpp
View File

@@ -495,11 +495,9 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK
void CFanControlNotifier::setSpeed(unsigned int speed) void CFanControlNotifier::setSpeed(unsigned int speed)
{ {
#ifndef BOXMODEL_APOLLO
int cfd;
printf("FAN Speed %d\n", speed); printf("FAN Speed %d\n", speed);
cfd = open("/dev/cs_control", O_RDONLY); #ifndef BOXMODEL_APOLLO
int cfd = open("/dev/cs_control", O_RDONLY);
if(cfd < 0) { if(cfd < 0) {
perror("Cannot open /dev/cs_control"); perror("Cannot open /dev/cs_control");
return; return;

1
src/zapit/src/femanager.cpp
View File

@@ -113,6 +113,7 @@ CFEManager::~CFEManager()
{ {
for(fe_map_iterator_t it = femap.begin(); it != femap.end(); it++) for(fe_map_iterator_t it = femap.begin(); it != femap.end(); it++)
delete it->second; delete it->second;
dmap.clear();
} }
CFEManager * CFEManager::getInstance() CFEManager * CFEManager::getInstance()