diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-03-04 19:33:56 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-03-04 19:33:56 +0700 |
| commit | cdf733ed16cf85e9d89ed45f0eceb060f77955fd (patch) | |
| tree | d6a234e722ad2d4c25b7c8bc3640b731525d8498 /drivers/firewire | |
| parent | 1736943179733a4629e0eaa773848bdeeaeefec1 (diff) | |
| parent | e28c3f2b514b5581e15614f7cf976131092cf4b6 (diff) | |
| download | kernel_samsung_aries-cdf733ed16cf85e9d89ed45f0eceb060f77955fd.zip kernel_samsung_aries-cdf733ed16cf85e9d89ed45f0eceb060f77955fd.tar.gz kernel_samsung_aries-cdf733ed16cf85e9d89ed45f0eceb060f77955fd.tar.bz2 | |
Merge 3.0.68
Conflicts:
kernel/cgroup.c
Change-Id: Ibae53bbb0eafbf4d273fce805eddce3db9ca48f9
Diffstat (limited to 'drivers/firewire')
| -rw-r--r-- | drivers/firewire/core-device.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c index 9f661e0..812cea3 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) |