mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
target/linux: sync to kernel 2.6.37-rc8, refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24847 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -11038,14 +11038,14 @@
|
|||||||
+ yaffs_UnpackTags2(tags, &pt);
|
+ yaffs_UnpackTags2(tags, &pt);
|
||||||
+ }
|
+ }
|
||||||
+ }
|
+ }
|
||||||
+
|
|
||||||
|
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
||||||
|
- tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
||||||
+ if (localData)
|
+ if (localData)
|
||||||
+ yaffs_ReleaseTempBuffer(dev, data, __LINE__);
|
+ yaffs_ReleaseTempBuffer(dev, data, __LINE__);
|
||||||
|
|
||||||
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
|
||||||
+ if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
+ if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
||||||
tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
+ tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
||||||
-
|
|
||||||
if (retval == 0)
|
if (retval == 0)
|
||||||
return YAFFS_OK;
|
return YAFFS_OK;
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -1,31 +0,0 @@
|
|||||||
From 6aeac0507d9710f201e2dd8b933431577e13be9e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Imre Kaloz <kaloz@openwrt.org>
|
|
||||||
Date: Tue, 2 Nov 2010 12:30:44 +0100
|
|
||||||
Subject: [PATCH] arm: export dma_set_coherent_mask
|
|
||||||
|
|
||||||
While a regression was fixed with commit 710224fa2750cf (arm: fix
|
|
||||||
"arm: fix pci_set_consistent_dma_mask for dmabounce devices"), a
|
|
||||||
new one was introduced as dma_set_coherent_mask wasn't exported
|
|
||||||
for modules. This patch takes care for this issue.
|
|
||||||
|
|
||||||
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
|
||||||
---
|
|
||||||
arch/arm/common/it8152.c | 1 +
|
|
||||||
arch/arm/mach-ixp4xx/common-pci.c | 2 +-
|
|
||||||
2 files changed, 2 insertions(+), 1 deletions(-)
|
|
||||||
|
|
||||||
--- a/arch/arm/common/it8152.c
|
|
||||||
+++ b/arch/arm/common/it8152.c
|
|
||||||
@@ -352,3 +352,4 @@ struct pci_bus * __init it8152_pci_scan_
|
|
||||||
return pci_scan_bus(nr, &it8152_ops, sys);
|
|
||||||
}
|
|
||||||
|
|
||||||
+EXPORT_SYMBOL(dma_set_coherent_mask);
|
|
||||||
--- a/arch/arm/mach-ixp4xx/common-pci.c
|
|
||||||
+++ b/arch/arm/mach-ixp4xx/common-pci.c
|
|
||||||
@@ -513,4 +513,4 @@ int dma_set_coherent_mask(struct device
|
|
||||||
|
|
||||||
EXPORT_SYMBOL(ixp4xx_pci_read);
|
|
||||||
EXPORT_SYMBOL(ixp4xx_pci_write);
|
|
||||||
-
|
|
||||||
+EXPORT_SYMBOL(dma_set_coherent_mask);
|
|
||||||
Reference in New Issue
Block a user