usbfs: don't store bad pointers in registration (e04199b2) · Commits · 戴 / test

This patch (as1107) fixes a small bug in the usbfs registration and unregistration code. It avoids leaving an error value stored in the device's usb_classdev field and it avoids trying to unregister a NULL pointer. (It also fixes a rather extreme overuse of whitespace.) Signed-off-by:

Alan Stern <stern@rowland.harvard.edu> Signed-off-by:

Greg Kroah-Hartman <gregkh@suse.de>

drivers/usb/core/devio.c

+10 −9

Original line number	Diff line number	Diff line
		@@ -1726,19 +1726,20 @@ static struct class *usb_classdev_class;

		static int usb_classdev_add(struct usb_device *dev)
		{
		int minor = ((dev->bus->busnum-1) * 128) + (dev->devnum-1);

		dev->usb_classdev = device_create(usb_classdev_class, &dev->dev,
		MKDEV(USB_DEVICE_MAJOR, minor),
		"usbdev%d.%d", dev->bus->busnum, dev->devnum);
		if (IS_ERR(dev->usb_classdev))
		return PTR_ERR(dev->usb_classdev);

		struct device *cldev;

		cldev = device_create(usb_classdev_class, &dev->dev, dev->dev.devt,
		"usbdev%d.%d", dev->bus->busnum,
		dev->devnum);
		if (IS_ERR(cldev))
		return PTR_ERR(cldev);
		dev->usb_classdev = cldev;
		return 0;
		}

		static void usb_classdev_remove(struct usb_device *dev)
		{
		if (dev->usb_classdev)
		device_unregister(dev->usb_classdev);
		usb_fs_classdev_common_remove(dev);
		}

Admin message