linux-next: manual merge of the ttydev tree with the usb.current tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/sierra.c between commit
72c9d57967ab2b6a32a215c6063c2943f0e48ab4 ("USB: serial: sierra driver bug
fix for composite interface") from the usb.current tree and commit
1156df675ae541b21dc343912413f201f87a3909 ("tty-usb-use-port") from the
ttydev tree.

Overlapping changes.  I fixed it up, I think (see below) and can carry
the fix as necessary.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/usb/serial/sierra.c
index 913225c,2617ea8..0000000
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@@ -251,46 -251,28 +251,43 @@@ static int sierra_send_setup(struct usb
  
  	portdata = usb_get_serial_port_data(port);
  
- 	if (tty) {
- 		int val = 0;
- 		if (portdata->dtr_state)
- 			val |= 0x01;
- 		if (portdata->rts_state)
- 			val |= 0x02;
- 
- 		/* If composite device then properly report interface */
- 		if (serial->num_ports == 1) {
- 			interface = sierra_calc_interface(serial);
- 
- 			/* Control message is sent only to interfaces with
- 			 * interrupt_in endpoints
- 			 */
- 			if (port->interrupt_in_urb) {
- 				/* send control message */
- 				return usb_control_msg(serial->dev,
- 					usb_rcvctrlpipe(serial->dev, 0),
- 					0x22, 0x21, val, interface,
- 					NULL, 0, USB_CTRL_SET_TIMEOUT);
- 			}
- 		}
+ 	if (portdata->dtr_state)
+ 		val |= 0x01;
+ 	if (portdata->rts_state)
+ 		val |= 0x02;
  
- 		/* Otherwise the need to do non-composite mapping */
- 		else {
- 			if (port->bulk_out_endpointAddress == 2)
- 				interface = 0;
- 			else if (port->bulk_out_endpointAddress == 4)
- 				interface = 1;
- 			else if (port->bulk_out_endpointAddress == 5)
- 				interface = 2;
+ 	/* If composite device then properly report interface */
 -	if (serial->num_ports == 1)
++	if (serial->num_ports == 1) {
+ 		interface = sierra_calc_interface(serial);
  
++		/* Control message is sent only to interfaces with
++		 * interrupt_in endpoints
++		 */
++		if (port->interrupt_in_urb) {
++			/* send control message */
 +			return usb_control_msg(serial->dev,
 +				usb_rcvctrlpipe(serial->dev, 0),
 +				0x22, 0x21, val, interface,
 +				NULL, 0, USB_CTRL_SET_TIMEOUT);
- 
 +		}
 +	}
 +
+ 	/* Otherwise the need to do non-composite mapping */
+ 	else {
+ 		if (port->bulk_out_endpointAddress == 2)
+ 			interface = 0;
+ 		else if (port->bulk_out_endpointAddress == 4)
+ 			interface = 1;
+ 		else if (port->bulk_out_endpointAddress == 5)
+ 			interface = 2;
 -	}
 -	return usb_control_msg(serial->dev,
++
++		return usb_control_msg(serial->dev,
+ 			usb_rcvctrlpipe(serial->dev, 0),
+ 			0x22, 0x21, val, interface,
+ 			NULL, 0, USB_CTRL_SET_TIMEOUT);
++
++	}
++
  	return 0;
  }