diff options
| author | Oliver Neukum <oneukum@suse.de> | 2007-01-25 11:22:24 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-16 15:32:17 -0800 |
| commit | 6957e1ac9c498ff934eaf1b7591b5ea1c98b6e54 (patch) | |
| tree | 4d02721f6f0b376a8f6fe084647acebfe6f79d2b /drivers/usb/core | |
| parent | c5999f0da73b7f46435a67671c8861ed14a94c4e (diff) | |
| download | op-kernel-dev-6957e1ac9c498ff934eaf1b7591b5ea1c98b6e54.zip op-kernel-dev-6957e1ac9c498ff934eaf1b7591b5ea1c98b6e54.tar.gz | |
USB: fix needless failure under certain conditions
in devices.c we have a piece of code for dealing with losing in a race.
If we indeed lose the race we don't care whether our own memory allocation
worked. The check for that is so early that we return early even if we
don't have to.
Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/core')
| -rw-r--r-- | drivers/usb/core/devices.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c index a47c30b..aefc798 100644 --- a/drivers/usb/core/devices.c +++ b/drivers/usb/core/devices.c @@ -604,10 +604,6 @@ static unsigned int usb_device_poll(struct file *file, struct poll_table_struct lock_kernel(); if (!st) { st = kmalloc(sizeof(struct usb_device_status), GFP_KERNEL); - if (!st) { - unlock_kernel(); - return POLLIN; - } /* we may have dropped BKL - need to check for having lost the race */ if (file->private_data) { @@ -615,6 +611,11 @@ static unsigned int usb_device_poll(struct file *file, struct poll_table_struct st = file->private_data; goto lost_race; } + /* we haven't lost - check for allocation failure now */ + if (!st) { + unlock_kernel(); + return POLLIN; + } /* * need to prevent the module from being unloaded, since |
