From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org,
Elina Pasheva <epasheva@sierrawireless•com>,
Alan Cox <alan@lxorguk•ukuu.org.uk>
Subject: linux-next: manual merge of the usb tree with the ttydevtree
Date: Wed, 29 Apr 2009 16:22:28 +1000 [thread overview]
Message-ID: <20090429162228.752887ac.sfr@canb.auug.org.au> (raw)
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/sierra.c between commit
e675a5b8305a4d244273c34698ba411ddcc0f42a ("tty-usb-use-port") from the
ttydev tree and commit 7b8163621c22ea34636314da663b9cdea50342be ("USB:
serial: sierra driver debug info visibility improvement") from the usb
tree.
I fixed it up (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 1319b89,4d02b83..0000000
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@@ -245,9 -246,8 +245,9 @@@ static int sierra_send_setup(struct usb
struct usb_serial *serial = port->serial;
struct sierra_port_private *portdata;
__u16 interface = 0;
+ int val = 0;
- dev_dbg(&port->dev, "%s", __func__);
+ dev_dbg(&port->dev, "%s\n", __func__);
portdata = usb_get_serial_port_data(port);
@@@ -279,9 -297,9 +279,9 @@@
static void sierra_set_termios(struct tty_struct *tty,
struct usb_serial_port *port, struct ktermios *old_termios)
{
- dev_dbg(&port->dev, "%s", __func__);
+ dev_dbg(&port->dev, "%s\n", __func__);
tty_termios_copy_hw(tty->termios, old_termios);
- sierra_send_setup(tty, port);
+ sierra_send_setup(port);
}
static int sierra_tiocmget(struct tty_struct *tty, struct file *file)
@@@ -604,21 -626,9 +604,21 @@@ static void sierra_dtr_rts(struct usb_s
if (serial->dev) {
mutex_lock(&serial->disc_mutex);
if (!serial->disconnected)
- sierra_send_setup(tty, port);
+ sierra_send_setup(port);
mutex_unlock(&serial->disc_mutex);
+ }
+}
+
+static void sierra_close(struct usb_serial_port *port)
+{
+ int i;
+ struct usb_serial *serial = port->serial;
+ struct sierra_port_private *portdata;
- dev_dbg(&port->dev, "%s", __func__);
++ dev_dbg(&port->dev, "%s\n", __func__);
+ portdata = usb_get_serial_port_data(port);
+
+ if (serial->dev) {
/* Stop reading/writing urbs */
for (i = 0; i < N_IN_URB; i++)
usb_kill_urb(portdata->in_urbs[i]);
next reply other threads:[~2009-04-29 6:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-29 6:22 Stephen Rothwell [this message]
2009-04-29 17:52 ` linux-next: manual merge of the usb tree with the ttydevtree Greg KH
2009-04-30 3:27 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090429162228.752887ac.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alan@lxorguk$(echo .)ukuu.org.uk \
--cc=epasheva@sierrawireless$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox