drivers: Fix upstream merging derps (32110240) · Commits · e / devices / android_kernel_sony_msm8994

drivers/base/core.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1020,6 +1020,7 @@ int device_add(struct device *dev)
		struct kobject *kobj;
		struct class_interface *class_intf;
		int error = -EINVAL;
		struct kobject *glue_dir = NULL;

		dev = get_device(dev);
		if (!dev)

+2 −11

Original line number	Diff line number	Diff line
		@@ -1134,14 +1134,8 @@ static int xpad_init_input(struct usb_xpad *xpad)
		xpad->dev = input_dev;
		input_dev->name = xpad->name;
		input_dev->phys = xpad->phys;
		usb_to_input_id(udev, &input_dev->id);

		if (xpad->xtype == XTYPE_XBOX360W) {
		/* x360w controllers and the receiver have different ids */
		input_dev->id.product = 0x02a1;
		}

		input_dev->dev.parent = &intf->dev;
		usb_to_input_id(xpad->udev, &input_dev->id);
		input_dev->dev.parent = &xpad->intf->dev;

		input_set_drvdata(input_dev, xpad);

		@@ -1227,9 +1221,6 @@ static int xpad_probe(struct usb_interface intf, const struct usb_device_id id
		int ep_irq_in_idx;
		int i, error;

		if (intf->cur_altsetting->desc.bNumEndpoints != 2)
		return -ENODEV;

		for (i = 0; xpad_device[i].idVendor; i++) {
		if ((le16_to_cpu(udev->descriptor.idVendor) == xpad_device[i].idVendor) &&
		(le16_to_cpu(udev->descriptor.idProduct) == xpad_device[i].idProduct))