Attachment 271941 Details for Bug 253096 – Candidate patch 1 - same function in option

[patch] Candidate patch 1 - same function in option

linux-2.6.23.1-42.fc8.e220.1.diff (text/plain), 1.57 KB, created by Pete Zaitcev on 2007-11-28 23:38:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pete Zaitcev

Created: 2007-11-28 23:38:58 UTC

Size: 1.57 KB

patch

obsolete

>diff -urp -X dontdiff linux-2.6.23.1-42.fc8/drivers/usb/serial/option.c linux-2.6.23.1-42.fc8.e220.1/drivers/usb/serial/option.c
>--- linux-2.6.23.1-42.fc8/drivers/usb/serial/option.c	2007-10-09 13:31:38.000000000 -0700
>+++ linux-2.6.23.1-42.fc8.e220.1/drivers/usb/serial/option.c	2007-11-27 21:36:11.000000000 -0800
>@@ -448,7 +448,7 @@ static void option_indat_callback(struct
> 			err = usb_submit_urb(urb, GFP_ATOMIC);
> 			if (err)
> 				printk(KERN_ERR "%s: resubmit read urb failed. "
>-					"(%d)", __FUNCTION__, err);
>+					"(%d)\n", __FUNCTION__, err);
> 		}
> 	}
> 	return;
>@@ -728,6 +728,35 @@ static int option_send_setup(struct usb_
> 	return 0;
> }
> 
>+static void option_start_huawei(struct usb_serial *serial)
>+{
>+	struct usb_device *dev = serial->dev;
>+	char *buf;
>+	int rc;
>+
>+	if (!(le16_to_cpu(dev->descriptor.idVendor) == HUAWEI_VENDOR_ID &&
>+	    le16_to_cpu(dev->descriptor.idProduct) == HUAWEI_PRODUCT_E220))
>+		return;
>+
>+	if ((buf = kmalloc(1, GFP_KERNEL)) == 0)
>+		goto err_buf;
>+
>+	buf[0] = 0x1;
>+	rc = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
>+		USB_REQ_SET_FEATURE, USB_TYPE_STANDARD | USB_RECIP_DEVICE,
>+		0x01, 0x0, buf, 1, 1000);
>+	if (rc) {
>+		printk(KERN_ERR "%s: HUAWEI E220 setup failed (%d)\n",
>+		    __FUNCTION__, rc);
>+	}
>+
>+	kfree(buf);
>+	return;
>+
>+err_buf:
>+	;
>+}
>+
> static int option_startup(struct usb_serial *serial)
> {
> 	int i, err;
>@@ -736,6 +765,8 @@ static int option_startup(struct usb_ser
> 
> 	dbg("%s", __FUNCTION__);
> 
>+	option_start_huawei(serial);
>+
> 	/* Now setup per port private data */
> 	for (i = 0; i < serial->num_ports; i++) {
> 		port = serial->port[i];

Actions: View | Diff

Attachments on bug 253096: 252141 | 271941 | 278531 | 294762 | 294903 | 294904 | 303000 | 303001 | 306563