summaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorAlan Cox2009-10-12 16:38:26 +0200
committerGreg Kroah-Hartman2009-10-14 23:14:39 +0200
commit317c68c04d53198f38314d29ba28b8fc632eccab (patch)
tree6823b31710ca0898b8e13f25e3f9f82043963ca0 /drivers/staging
parentStaging: et131x: Correct WRAP bit handling (diff)
downloadkernel-qcow2-linux-317c68c04d53198f38314d29ba28b8fc632eccab.tar.gz
kernel-qcow2-linux-317c68c04d53198f38314d29ba28b8fc632eccab.tar.xz
kernel-qcow2-linux-317c68c04d53198f38314d29ba28b8fc632eccab.zip
Staging: et131x: Fix the add_10bit macro
Duh.. we need to preserve the wrap bit when adding. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/et131x/et1310_address_map.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/et131x/et1310_address_map.h b/drivers/staging/et131x/et1310_address_map.h
index 6294d3814e72..2c3d65a622a7 100644
--- a/drivers/staging/et131x/et1310_address_map.h
+++ b/drivers/staging/et131x/et1310_address_map.h
@@ -223,7 +223,7 @@ typedef union _TXDMA_PR_NUM_DES_t {
extern inline void add_10bit(u32 *v, int n)
{
- *v = INDEX10(*v + n);
+ *v = INDEX10(*v + n) | (*v & ET_DMA10_WRAP);
}
/*