--- linux-2.6.30.4-orig/arch/arm/mach-comcerto/include/mach/comcerto-100.h	2009-08-17 20:00:52.715832000 -0700
+++ linux-2.6.30.4-new/arch/arm/mach-comcerto/include/mach/comcerto-100.h	2009-08-19 14:00:32.340807000 -0700
@@ -33,6 +33,7 @@
 #define COMCERTO_AHBCLK			165 /* Mhz */
 #define COMCERTO_ARMCLK			450 /* Mhz */
 #endif
+#define COMCERTO_AHBCLK_HZ              (165*1000*1000)
 /* PA of IO on APB bus */
 #define APB_PADDR_BASE			0x10000000
 
--- linux-2.6.30.4-orig/drivers/i2c/busses/i2c-comcerto.c	2009-08-17 20:00:55.241822000 -0700
+++ linux-2.6.30.4-new/drivers/i2c/busses/i2c-comcerto.c	2009-08-19 13:43:29.808527000 -0700
@@ -98,7 +98,7 @@
 
 	for (m = 0; m < 16; m++) {
 		for (n = 0; n < 8; n++) {
-			hz = (COMCERTO_AHBCLK*1000*1000) / ((1 << n) * (m + 1) * 10);
+			hz = COMCERTO_AHBCLK_HZ / ((1 << n) * (m + 1) * 10);
 			if (!saved_hz || abs(speed_hz - hz) < abs(speed_hz - saved_hz)) {
 				saved_n = n;
 				saved_m = m;
@@ -458,7 +458,7 @@
 	else
 		comcerto_i2c_tx(i2c);
 	if (i2c->irq < 0) {
-		/*if (i2c->msg != NULL)*/
+		if (i2c->msg != NULL)
 			goto polling_mode;
 	}
 	else {
