diff --git a/drivers/ieee1394/csr1212.c b/drivers/ieee1394/csr1212.c
index 6c2f55bb9463b68fb0ed1b85fe79ec711508b923..2fd465ec94ec110419a4ba1f0532ec7bceb15100 100644
--- a/drivers/ieee1394/csr1212.c
+++ b/drivers/ieee1394/csr1212.c
@@ -932,7 +932,9 @@ static void csr1212_fill_cache(struct csr1212_csr_rom_cache *cache)
 	}
 }
 
-#define CSR1212_EXTENDED_ROM_SIZE (0x10000 * sizeof(u32))
+/* This size is arbitrarily chosen.
+ * The struct overhead is subtracted for more economic allocations. */
+#define CSR1212_EXTENDED_ROM_SIZE (2048 - sizeof(struct csr1212_csr_rom_cache))
 
 int csr1212_generate_csr_image(struct csr1212_csr *csr)
 {
diff --git a/drivers/ieee1394/csr1212.h b/drivers/ieee1394/csr1212.h
index 655827527ecc9133f85494ef8db8662fd60090ac..cc23f3abe0cdcc6ca641b3ac56c65dc80e93e201 100644
--- a/drivers/ieee1394/csr1212.h
+++ b/drivers/ieee1394/csr1212.h
@@ -31,10 +31,10 @@
 #define __CSR1212_H__
 
 #include <linux/types.h>
-#include <linux/vmalloc.h>
+#include <linux/slab.h>
 
-#define CSR1212_MALLOC(size)		vmalloc((size))
-#define CSR1212_FREE(ptr)		vfree(ptr)
+#define CSR1212_MALLOC(size)	kmalloc((size), GFP_KERNEL)
+#define CSR1212_FREE(ptr)	kfree(ptr)
 
 #define CSR1212_SUCCESS (0)