diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
commit | da7878d75b8520c9ae00d27dfbbce546a7bfdfbb (patch) | |
tree | 547fd497a80818a60ac36831377d5df97868173c /drivers/char/agp/frontend.c | |
parent | 0e50a4c6ab94ffe7e5515b86b5df9e5abc8c6b13 (diff) | |
parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) |
Merge branch 'linus' into x86/pebs
Diffstat (limited to 'drivers/char/agp/frontend.c')
-rw-r--r-- | drivers/char/agp/frontend.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c index 857b26227d87..e6cb1ab03e06 100644 --- a/drivers/char/agp/frontend.c +++ b/drivers/char/agp/frontend.c | |||
@@ -395,7 +395,7 @@ static int agp_remove_controller(struct agp_controller *controller) | |||
395 | 395 | ||
396 | if (agp_fe.current_controller == controller) { | 396 | if (agp_fe.current_controller == controller) { |
397 | agp_fe.current_controller = NULL; | 397 | agp_fe.current_controller = NULL; |
398 | agp_fe.backend_acquired = FALSE; | 398 | agp_fe.backend_acquired = false; |
399 | agp_backend_release(agp_bridge); | 399 | agp_backend_release(agp_bridge); |
400 | } | 400 | } |
401 | kfree(controller); | 401 | kfree(controller); |
@@ -443,7 +443,7 @@ static void agp_controller_release_current(struct agp_controller *controller, | |||
443 | } | 443 | } |
444 | 444 | ||
445 | agp_fe.current_controller = NULL; | 445 | agp_fe.current_controller = NULL; |
446 | agp_fe.used_by_controller = FALSE; | 446 | agp_fe.used_by_controller = false; |
447 | agp_backend_release(agp_bridge); | 447 | agp_backend_release(agp_bridge); |
448 | } | 448 | } |
449 | 449 | ||
@@ -573,7 +573,7 @@ static int agp_mmap(struct file *file, struct vm_area_struct *vma) | |||
573 | 573 | ||
574 | mutex_lock(&(agp_fe.agp_mutex)); | 574 | mutex_lock(&(agp_fe.agp_mutex)); |
575 | 575 | ||
576 | if (agp_fe.backend_acquired != TRUE) | 576 | if (agp_fe.backend_acquired != true) |
577 | goto out_eperm; | 577 | goto out_eperm; |
578 | 578 | ||
579 | if (!(test_bit(AGP_FF_IS_VALID, &priv->access_flags))) | 579 | if (!(test_bit(AGP_FF_IS_VALID, &priv->access_flags))) |
@@ -768,7 +768,7 @@ int agpioc_acquire_wrap(struct agp_file_private *priv) | |||
768 | 768 | ||
769 | atomic_inc(&agp_bridge->agp_in_use); | 769 | atomic_inc(&agp_bridge->agp_in_use); |
770 | 770 | ||
771 | agp_fe.backend_acquired = TRUE; | 771 | agp_fe.backend_acquired = true; |
772 | 772 | ||
773 | controller = agp_find_controller_by_pid(priv->my_pid); | 773 | controller = agp_find_controller_by_pid(priv->my_pid); |
774 | 774 | ||
@@ -778,7 +778,7 @@ int agpioc_acquire_wrap(struct agp_file_private *priv) | |||
778 | controller = agp_create_controller(priv->my_pid); | 778 | controller = agp_create_controller(priv->my_pid); |
779 | 779 | ||
780 | if (controller == NULL) { | 780 | if (controller == NULL) { |
781 | agp_fe.backend_acquired = FALSE; | 781 | agp_fe.backend_acquired = false; |
782 | agp_backend_release(agp_bridge); | 782 | agp_backend_release(agp_bridge); |
783 | return -ENOMEM; | 783 | return -ENOMEM; |
784 | } | 784 | } |
@@ -981,7 +981,7 @@ static long agp_ioctl(struct file *file, | |||
981 | ret_val = -EINVAL; | 981 | ret_val = -EINVAL; |
982 | goto ioctl_out; | 982 | goto ioctl_out; |
983 | } | 983 | } |
984 | if ((agp_fe.backend_acquired != TRUE) && | 984 | if ((agp_fe.backend_acquired != true) && |
985 | (cmd != AGPIOC_ACQUIRE)) { | 985 | (cmd != AGPIOC_ACQUIRE)) { |
986 | ret_val = -EBUSY; | 986 | ret_val = -EBUSY; |
987 | goto ioctl_out; | 987 | goto ioctl_out; |