Skip to content

Commit

Permalink
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Linus Torvalds committed Jun 23, 2005
2 parents 060de20 + d377e85 commit ee98689
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions drivers/base/bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,9 @@ int bus_add_device(struct device * dev)

if (bus) {
pr_debug("bus %s: add device %s\n", bus->name, dev->bus_id);
error = device_attach(dev);
device_attach(dev);
klist_add_tail(&bus->klist_devices, &dev->knode_bus);
if (error >= 0)
error = device_add_attrs(bus, dev);
error = device_add_attrs(bus, dev);
if (!error) {
sysfs_create_link(&bus->devices.kobj, &dev->kobj, dev->bus_id);
sysfs_create_link(&dev->kobj, &dev->bus->subsys.kset.kobj, "bus");
Expand Down
4 changes: 2 additions & 2 deletions drivers/usb/input/hid-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1762,7 +1762,7 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
intf->altsetting->desc.bInterfaceNumber);

if (!(hid = usb_hid_configure(intf)))
return -EIO;
return -ENODEV;

hid_init_reports(hid);
hid_dump_device(hid);
Expand All @@ -1777,7 +1777,7 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
if (!hid->claimed) {
printk ("HID device not claimed by input or hiddev\n");
hid_disconnect(intf);
return -EIO;
return -ENODEV;
}

printk(KERN_INFO);
Expand Down

0 comments on commit ee98689

Please sign in to comment.