diff --git a/[refs] b/[refs]
index b75872ff94fa..28f139a63df1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9e315a16a5536120bac09a6d4217b8381c73c5c
+refs/heads/master: c1b4d92789ada9ea6b7f1156ede7022eab309eab
diff --git a/trunk/drivers/media/video/tuner-i2c.h b/trunk/drivers/media/video/tuner-i2c.h
index 8ec5b41d459f..c53c327a487c 100644
--- a/trunk/drivers/media/video/tuner-i2c.h
+++ b/trunk/drivers/media/video/tuner-i2c.h
@@ -155,13 +155,17 @@ __fail:									\
 	__ret;								\
 })
 
-#define hybrid_tuner_release_state(state) do {				\
+#define hybrid_tuner_release_state(state)				\
+({									\
+	int __ret;							\
 	state->i2c_props.count--;					\
+	__ret = state->i2c_props.count;					\
 	if (!state->i2c_props.count) {					\
 		__tuner_info(state->i2c_props, "destroying instance\n");\
 		list_del(&state->hybrid_tuner_instance_list);		\
 		kfree(state);						\
 	}								\
-} while (0)
+	__ret;								\
+})
 
 #endif /* __TUNER_I2C_H__ */