Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel_extreme: Fix tracking of device opens / closes

Browse Source 
* Don't raise the open_count when the open fails
This commit is contained in:
Alexander von Gluck IV 2014-01-27 21:03:47 +00:00
parent 01696cd951
commit 3347bc1431
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/add-ons/kernel/drivers/graphics/intel_extreme/device.cpp
View File

@ -124,9 +124,9 @@ device_open(const char* name, uint32 /*flags*/, void** _cookie)
mutex_lock(&gLock);
if (info->open_count++ == 0) {
// this device has been opened for the first time, so
// we allocate needed resources and initialize the structure
if (info->open_count == 0) {
// This device hasn't been initialized yet, so we
// allocate needed resources and initialize the structure
info->init_status = intel_extreme_init(*info);
if (info->init_status == B_OK) {
#ifdef DEBUG_COMMANDS
@ -138,8 +138,11 @@ device_open(const char* name, uint32 /*flags*/, void** _cookie)
mutex_unlock(&gLock);
if (info->init_status == B_OK)
if (info->init_status == B_OK) {
info->open_count++;
*_cookie = info;
} else
ERROR("%s: initilization failed!\n", __func__);
return info->init_status;
}
@ -171,7 +174,6 @@ device_free(void* data)
}
mutex_unlock(&gLock);
return B_OK;
}