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

2 files changed, 4 insertions, 5 deletions

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 43722af90bdd..c3fac7fd555e 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -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");
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index 2d8bd9dcc6ed..740dec1f521d 100644
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -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);
@@ -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);