Commit 6c9ac65b authored by Dave Jones's avatar Dave Jones

Merge tetrachloride.(none):/mnt/stuff/kernel/2.5/bk-linus

into tetrachloride.(none):/mnt/stuff/kernel/2.5/agpgart
parents 214fd232 10a5709f
...@@ -49,13 +49,10 @@ int agp_backend_acquire(void) ...@@ -49,13 +49,10 @@ int agp_backend_acquire(void)
if (agp_bridge.type == NOT_SUPPORTED) if (agp_bridge.type == NOT_SUPPORTED)
return -EINVAL; return -EINVAL;
atomic_inc(&agp_bridge.agp_in_use); if (atomic_read(&agp_bridge.agp_in_use) != 0)
if (atomic_read(&agp_bridge.agp_in_use) != 1) {
atomic_dec(&agp_bridge.agp_in_use);
return -EBUSY; return -EBUSY;
}
MOD_INC_USE_COUNT; atomic_inc(&agp_bridge.agp_in_use);
return 0; return 0;
} }
...@@ -65,7 +62,6 @@ void agp_backend_release(void) ...@@ -65,7 +62,6 @@ void agp_backend_release(void)
return; return;
atomic_dec(&agp_bridge.agp_in_use); atomic_dec(&agp_bridge.agp_in_use);
MOD_DEC_USE_COUNT;
} }
struct agp_max_table { struct agp_max_table {
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment