diff -U3 --exclude-from=/tmp/tmp.WAjUp31037 -rNbw -U3 linux-2.6.24.4/drivers/spi/pxa2xx_spi.c src.cache/drivers/spi/pxa2xx_spi.c
--- linux-2.6.24.4/drivers/spi/pxa2xx_spi.c	2008-03-24 14:49:18.000000000 -0400
+++ src.cache/drivers/spi/pxa2xx_spi.c	2008-08-14 20:52:15.000000000 -0400
@@ -1142,11 +1142,12 @@
 		if (chip_info->cs_control)
 			chip->cs_control = chip_info->cs_control;
 
+		if (chip_info->timeout)
 		chip->timeout = chip_info->timeout;
 
-		chip->threshold = (SSCR1_RxTresh(chip_info->rx_threshold) &
+		chip->threshold = (SSCR1_RxTresh(chip_info->rx_threshold ? : 12) &
 								SSCR1_RFT) |
-				(SSCR1_TxTresh(chip_info->tx_threshold) &
+				(SSCR1_TxTresh(chip_info->tx_threshold ? : 4) &
 								SSCR1_TFT);
 
 		chip->enable_dma = chip_info->dma_burst_size != 0