diff -Nur wimax-i2400m-1.4.1/drivers/net/wimax/i2400m/driver.c 2/wimax-i2400m-1.4.1/drivers/net/wimax/i2400m/driver.c
--- wimax-i2400m-1.4.1/drivers/net/wimax/i2400m/driver.c	2009-06-03 17:34:33.000000000 +0400
+++ 2/wimax-i2400m-1.4.1/drivers/net/wimax/i2400m/driver.c	2009-02-06 09:31:29.000000000 +0300
@@ -614,7 +614,7 @@
 	d_fnstart(3, dev, "(i2400m %p)\n", i2400m);
 
 	snprintf(wimax_dev->name, sizeof(wimax_dev->name),
-		 "i2400m-%s:%s", dev->bus->name, dev_name(dev));
+		 "i2400m-%s:%s", dev->bus->name, dev->bus_id);
 
 	i2400m->bm_cmd_buf = kzalloc(I2400M_BM_CMD_BUF_SIZE, GFP_KERNEL);
 	if (i2400m->bm_cmd_buf == NULL) {
diff -Nur wimax-i2400m-1.4.1/drivers/net/wimax/i2400m/usb-notif.c 2/wimax-i2400m-1.4.1/drivers/net/wimax/i2400m/usb-notif.c
--- wimax-i2400m-1.4.1/drivers/net/wimax/i2400m/usb-notif.c	2009-06-03 17:32:42.000000000 +0400
+++ 2/wimax-i2400m-1.4.1/drivers/net/wimax/i2400m/usb-notif.c	2009-02-06 09:31:29.000000000 +0300
@@ -103,7 +103,7 @@
 		dev_err(dev, "HW BUG? Unknown/unexpected data in notification "
 			"message (%zu bytes)\n", buf_len);
 		snprintf(prefix, sizeof(prefix), "%s %s: ",
-			 dev_driver_string(dev) , dev_name(dev));
+			 dev_driver_string(dev) , dev->bus_id);
 		if (buf_len > 64) {
 			print_hex_dump(KERN_ERR, prefix, DUMP_PREFIX_OFFSET,
 				       8, 4, buf, 64, 0);
diff -Nur wimax-i2400m-1.4.1/include/linux/wimax/debug.h 2/wimax-i2400m-1.4.1/include/linux/wimax/debug.h
--- wimax-i2400m-1.4.1/include/linux/wimax/debug.h	2009-06-03 17:37:20.000000000 +0400
+++ 2/wimax-i2400m-1.4.1/include/linux/wimax/debug.h	2009-02-06 09:31:29.000000000 +0300
@@ -178,7 +178,7 @@
 		WARN_ON(1);
 	} else
 		snprintf(head, head_size, "%s %s: ",
-			 dev_driver_string(dev), dev_name(dev));
+			 dev_driver_string(dev), dev->bus_id);
 }