Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee98689b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 060de20e d377e85b

drivers/base/bus.c

+2 −3
Original line number Diff line number Diff line
@@ -270,9 +270,8 @@ 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);

		if (!error) {

			sysfs_create_link(&bus->devices.kobj, &dev->kobj, dev->bus_id);

drivers/usb/input/hid-core.c

+2 −2
Original line number Diff line number Diff line
@@ -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);