--- cx25840-core.c.org	2007-02-15 07:52:57.000000000 +0100
+++ cx25840-core.c	2007-02-15 07:53:33.000000000 +0100
@@ -907,13 +907,13 @@
 	state->vbi_line_offset = 8;
 	state->id = id;
 
+	i2c_attach_client(client);
+
 	if (state->is_cx25836)
 		cx25836_initialize(client);
 	else
 		cx25840_initialize(client, 1);
 
-	i2c_attach_client(client);
-
 	return 0;
 }
 
--- cx25840-firmware.c.org	2007-02-15 07:53:03.000000000 +0100
+++ cx25840-firmware.c	2007-02-15 07:53:12.000000000 +0100
@@ -37,7 +37,7 @@
  */
 #define FWSEND 48
 
-#define FWDEV(x) &((x)->adapter->dev)
+#define FWDEV(x) &((x)->dev)
 
 static char *firmware = FWFILE;