From 939a82ed9709ef3f95bb7be0b0772b8f10734502 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Wed, 27 Feb 2013 17:04:04 -0800 Subject: [PATCH] --- yaml --- r: 359331 b: refs/heads/master c: 3bec60d511179853138836ae6e1b61fe34d9235f h: refs/heads/master i: 359329: 896246987da65d4ae0d6e96217ca8f52d3b9143c 359327: a0d0aa6cc986bdf9025c72fe36484b60f2e1b93d v: v3 --- [refs] | 2 +- trunk/drivers/firewire/core-device.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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)