tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

Linus Torvalds ee98689b 060de20e

+4 -5
unified split
+2 -3
drivers/base/bus.c
··· 270 270 271 271 if (bus) { 272 272 pr_debug("bus %s: add device %s\n", bus->name, dev->bus_id); 273 - error = device_attach(dev); 273 + device_attach(dev); 274 274 klist_add_tail(&bus->klist_devices, &dev->knode_bus); 275 - if (error >= 0) 276 - error = device_add_attrs(bus, dev); 275 + error = device_add_attrs(bus, dev); 277 276 if (!error) { 278 277 sysfs_create_link(&bus->devices.kobj, &dev->kobj, dev->bus_id); 279 278 sysfs_create_link(&dev->kobj, &dev->bus->subsys.kset.kobj, "bus");
+2 -2
drivers/usb/input/hid-core.c
··· 1762 1762 intf->altsetting->desc.bInterfaceNumber); 1763 1763 1764 1764 if (!(hid = usb_hid_configure(intf))) 1765 - return -EIO; 1765 + return -ENODEV; 1766 1766 1767 1767 hid_init_reports(hid); 1768 1768 hid_dump_device(hid); ··· 1777 1777 if (!hid->claimed) { 1778 1778 printk ("HID device not claimed by input or hiddev\n"); 1779 1779 hid_disconnect(intf); 1780 - return -EIO; 1780 + return -ENODEV; 1781 1781 } 1782 1782 1783 1783 printk(KERN_INFO);