diff --git a/[refs] b/[refs]
index 4ee0051c9e2b..e2bc38e503fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afd00d7235c1989d06d75cf8ac3d7722fcf2f394
+refs/heads/master: a29878553a9a7b4c06f93c7e383527cf014d4ceb
diff --git a/trunk/sound/pci/lx6464es/lx_core.c b/trunk/sound/pci/lx6464es/lx_core.c
index ad52f4187e40..8c3e7fcefd99 100644
--- a/trunk/sound/pci/lx6464es/lx_core.c
+++ b/trunk/sound/pci/lx6464es/lx_core.c
@@ -81,8 +81,12 @@ unsigned long lx_dsp_reg_read(struct lx6464es *chip, int port)
 static void lx_dsp_reg_readbuf(struct lx6464es *chip, int port, u32 *data,
 			       u32 len)
 {
-	void __iomem *address = lx_dsp_register(chip, port);
-	memcpy_fromio(data, address, len*sizeof(u32));
+	u32 __iomem *address = lx_dsp_register(chip, port);
+	int i;
+
+	/* we cannot use memcpy_fromio */
+	for (i = 0; i != len; ++i)
+		data[i] = ioread32(address + i);
 }
 
 
@@ -95,8 +99,12 @@ void lx_dsp_reg_write(struct lx6464es *chip, int port, unsigned data)
 static void lx_dsp_reg_writebuf(struct lx6464es *chip, int port,
 				const u32 *data, u32 len)
 {
-	void __iomem *address = lx_dsp_register(chip, port);
-	memcpy_toio(address, data, len*sizeof(u32));
+	u32 __iomem *address = lx_dsp_register(chip, port);
+	int i;
+
+	/* we cannot use memcpy_to */
+	for (i = 0; i != len; ++i)
+		iowrite32(data[i], address + i);
 }