projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
x86: fix pci-gart failure handling
[linux-2.6-block.git]
/
arch
/
x86
/
kernel
/
pci-gart_64.c
diff --git
a/arch/x86/kernel/pci-gart_64.c
b/arch/x86/kernel/pci-gart_64.c
index ae7e0161ce46e9e1eacbca8c2cb24a5a599456b9..79b514b381b1476acd8559f18e6c0019b0c19910 100644
(file)
--- a/
arch/x86/kernel/pci-gart_64.c
+++ b/
arch/x86/kernel/pci-gart_64.c
@@
-435,7
+435,7
@@
static int gart_map_sg(struct device *dev, struct scatterlist *sg, int nents,
error:
flush_gart();
- gart_unmap_sg(dev, sg,
nents
, dir);
+ gart_unmap_sg(dev, sg,
out
, dir);
/* When it was forced or merged try again in a dumb way */
if (force_iommu || iommu_merge) {
out = dma_map_sg_nonforce(dev, sg, nents, dir);