The following commit has been merged in the linux branch: commit 317c68c04d53198f38314d29ba28b8fc632eccab Author: Alan Cox alan@linux.intel.com Date: Mon Oct 12 15:38:26 2009 +0100
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
diff --git a/drivers/staging/et131x/et1310_address_map.h b/drivers/staging/et131x/et1310_address_map.h index 6294d38..2c3d65a 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); }
/*