diff --git a/[refs] b/[refs]
index db2c64caac90..d4d489f99a14 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5765348cd41c17c797765174d479508ecfbd43de
+refs/heads/master: f1bee6994426c3a1435ee8d214b1c426a009784f
diff --git a/trunk/drivers/media/video/cx23885/cimax2.c b/trunk/drivers/media/video/cx23885/cimax2.c
index 2105c2e4cf46..9a6536998d90 100644
--- a/trunk/drivers/media/video/cx23885/cimax2.c
+++ b/trunk/drivers/media/video/cx23885/cimax2.c
@@ -157,7 +157,7 @@ int netup_ci_get_mem(struct cx23885_dev *dev)
 }
 
 int netup_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot,
-				u8 flag, u8 read, u8 addr, u8 data)
+				u8 flag, u8 read, int addr, u8 data)
 {
 	struct netup_ci_state *state = en50221->data;
 	struct cx23885_tsport *port = state->priv;