--- drivers/media/video/msm/msm_io8x.c	2010-09-28 14:03:31.000000000 +0200
+++ ../ace-2.6.35-gb-mr/drivers/media/video/msm/msm_io8x.c	2010-11-30 07:27:00.000000000 +0100
@@ -79,7 +79,7 @@
 		break;
 	}
 
-	if (!IS_ERR(clk) && clk != NULL) {
+	if (!IS_ERR(clk)) {
 		/* Set rate here *before* enabling the block to prevent
 		 * unstable clock from source.
 		 */
@@ -120,7 +120,7 @@
 		break;
 	}
 
-	if (!IS_ERR(clk) && clk != NULL) {
+	if (!IS_ERR(clk)) {
 		clk_disable(clk);
 		clk_put(clk);
 	} else