1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
index 9f661e06931..812cea37a5b 100644
--- a/drivers/firewire/core-device.c
+++ b/drivers/firewire/core-device.c
@@ -995,6 +995,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)