diff --git a/[refs] b/[refs]
index b27ad421d7da..67a9edcbf0d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69ee266b4c890aea7505388c4e394f5757166531
+refs/heads/master: 3bec60d511179853138836ae6e1b61fe34d9235f
diff --git a/trunk/drivers/firewire/core-device.c b/trunk/drivers/firewire/core-device.c
index 3873d535b28d..af3e8aa5eedc 100644
--- a/trunk/drivers/firewire/core-device.c
+++ b/trunk/drivers/firewire/core-device.c
@@ -1020,6 +1020,10 @@ static void fw_device_init(struct work_struct *work)
 	ret = idr_pre_get(&fw_device_idr, GFP_KERNEL) ?
 	      idr_get_new(&fw_device_idr, device, &minor) :
 	      -ENOMEM;
+	if (minor >= 1 << MINORBITS) {
+		idr_remove(&fw_device_idr, minor);
+		minor = -ENOSPC;
+	}
 	up_write(&fw_device_rwsem);
 
 	if (ret < 0)