Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

usb devio: handle class_device_create() error

Browse source 
This patch adds missing class_device_create() error check,
and makes notifier return NOTIFY_BAD.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Akinobu Mita 2006-10-09 18:09:33 +09:00 committed by Greg Kroah-Hartman
parent f8ac232ad7
commit 27d39e2627
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/usb/core/devio.c
View file

@ -1588,15 +1588,18 @@ const struct file_operations usbfs_device_file_operations = {
.release = usbdev_release, .release = usbdev_release,
}; };
static void usbdev_add(struct usb_device *dev) static int usbdev_add(struct usb_device *dev)
{ {
int minor = ((dev->bus->busnum-1) * 128) + (dev->devnum-1); int minor = ((dev->bus->busnum-1) * 128) + (dev->devnum-1);
dev->class_dev = class_device_create(usb_device_class, NULL, dev->class_dev = class_device_create(usb_device_class, NULL,
MKDEV(USB_DEVICE_MAJOR, minor), &dev->dev, MKDEV(USB_DEVICE_MAJOR, minor), &dev->dev,
"usbdev%d.%d", dev->bus->busnum, dev->devnum); "usbdev%d.%d", dev->bus->busnum, dev->devnum);
if (IS_ERR(dev->class_dev))
return PTR_ERR(dev->class_dev);
dev->class_dev->class_data = dev; dev->class_dev->class_data = dev;
return 0;
} }
static void usbdev_remove(struct usb_device *dev) static void usbdev_remove(struct usb_device *dev)
@ -1609,7 +1612,8 @@ static int usbdev_notify(struct notifier_block *self, unsigned long action,
{ {
switch (action) { switch (action) {
case USB_DEVICE_ADD: case USB_DEVICE_ADD:
usbdev_add(dev); if (usbdev_add(dev))
return NOTIFY_BAD;
break; break;
case USB_DEVICE_REMOVE: case USB_DEVICE_REMOVE:
usbdev_remove(dev); usbdev_remove(dev);