On Sun, May 04, 2014 at 10:11:43AM +0200, Johan Hovold wrote: > On Sun, Apr 27, 2014 at 04:47:43PM +0200, Bjørn Mork wrote: > > From: Bjørn Mork <bjorn@xxxxxxx> > > > > Use a consistent style for all multiline comments. > > > > Signed-off-by: Bjørn Mork <bjorn@xxxxxxx> > > Signed-off-by: Johan Hovold <jhovold@xxxxxxxxx> Greg, it seems you only applied the first patch of this series (to usb-linus), but I can't find this one and the following three patches that were destined for usb-next in your trees. Still in the apply-queue, or do you want me to resend them? Johan > > --- > > drivers/usb/serial/qcserial.c | 9 ++++++--- > > 1 file changed, 6 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c > > index 6c0a542e8ec1..e282155dd4a1 100644 > > --- a/drivers/usb/serial/qcserial.c > > +++ b/drivers/usb/serial/qcserial.c > > @@ -225,12 +225,14 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id) > > /* default to enabling interface */ > > altsetting = 0; > > > > - /* Composite mode; don't bind to the QMI/net interface as that > > + /* > > + * Composite mode; don't bind to the QMI/net interface as that > > * gets handled by other drivers. > > */ > > > > if (is_gobi1k) { > > - /* Gobi 1K USB layout: > > + /* > > + * Gobi 1K USB layout: > > * 0: DM/DIAG (use libqcdm from ModemManager for communication) > > * 1: serial port (doesn't respond) > > * 2: AT-capable modem port > > @@ -244,7 +246,8 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id) > > else > > altsetting = -1; > > } else { > > - /* Gobi 2K+ USB layout: > > + /* > > + * Gobi 2K+ USB layout: > > * 0: QMI/net > > * 1: DM/DIAG (use libqcdm from ModemManager for communication) > > * 2: AT-capable modem port -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html