diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 12:17:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 12:17:32 -0500 |
| commit | 2e9abdd9bad485970b37cd53a82f92702054984c (patch) | |
| tree | 8f473a59aae906e65d0f78bbc98a8db12401d5d2 /drivers/char/agp/frontend.c | |
| parent | c36cd16f78a5dd740a619ef8445e35a73484d58b (diff) | |
| parent | 9d1f6b28ee2429a1f94a9f7074ffae7f918d33be (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
[AGPGART] x86_64: Enable VIA AGP driver on x86-64 for VIA P4 chipsets
[AGPGART] x86_64: Fix wrong PCI ID for ALI M1695 AGP bridge
[AGPGART] ATI RS350 support.
[AGPGART] Lots of CodingStyle/whitespace cleanups.
Diffstat (limited to 'drivers/char/agp/frontend.c')
| -rw-r--r-- | drivers/char/agp/frontend.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c index 97eeb2345b18..ffcf15c30e90 100644 --- a/drivers/char/agp/frontend.c +++ b/drivers/char/agp/frontend.c | |||
| @@ -781,7 +781,7 @@ static int agpioc_acquire_wrap(struct agp_file_private *priv) | |||
| 781 | if (agp_fe.current_controller != NULL) | 781 | if (agp_fe.current_controller != NULL) |
| 782 | return -EBUSY; | 782 | return -EBUSY; |
| 783 | 783 | ||
| 784 | if(!agp_bridge) | 784 | if (!agp_bridge) |
| 785 | return -ENODEV; | 785 | return -ENODEV; |
| 786 | 786 | ||
| 787 | if (atomic_read(&agp_bridge->agp_in_use)) | 787 | if (atomic_read(&agp_bridge->agp_in_use)) |