From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Alan Cox <alan@lxorguk•ukuu.org.uk>
Cc: linux-next@vger•kernel.org, Greg KH <greg@kroah•com>
Subject: linux-next: manual merge of the ttydev tree
Date: Thu, 21 Aug 2008 18:03:08 +1000 [thread overview]
Message-ID: <20080821180308.141bccb7.sfr@canb.auug.org.au> (raw)
Hi Alan,
Today's linux-next merge of the ttydev tree got trivial conflicts in
drivers/usb/serial/aircable.c and drivers/usb/serial/keyspan_pda.c
between commit 7b4dc5ed3acb8410fd078a6876d01c206af803ed ("USB: remove use
of err() in drivers/usb/serial") from the usb tree and commit
9c3656d0341bc2763b3f4abc9484776ff28c1c12 ("tty-usbserial-kref") from the
ttydev tree.
Just overlapping context of changes. I fixed it up (see below). I assume
that the err -> dev_err changes could be added to your tree, Alan.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/usb/serial/aircable.c
index 27ea680,67dc982..0000000
--- a/drivers/usb/serial/aircable.c
+++ b/drivers/usb/serial/aircable.c
@@@ -287,9 -287,8 +287,9 @@@ static void aircable_read(struct work_s
tty_prepare_flip_string(tty, &data, count);
if (!data) {
- err("%s- kzalloc(%d) failed.", __func__, count);
+ dev_err(&port->dev, "%s- kzalloc(%d) failed.\n",
+ __func__, count);
- return;
+ goto out;
}
serial_buf_get(priv->rx_buf, data, count);
diff --cc drivers/usb/serial/keyspan_pda.c
index 507f8bd,d799883..0000000
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@@ -261,9 -262,10 +262,11 @@@ static void keyspan_pda_rx_interrupt(st
exit:
retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval)
- err("%s - usb_submit_urb failed with result %d",
- __func__, retval);
+ dev_err(&port->dev,
+ "%s - usb_submit_urb failed with result %d\n",
+ __func__, retval);
+ out:
+ tty_kref_put(tty);
}
next reply other threads:[~2008-08-21 8:03 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-21 8:03 Stephen Rothwell [this message]
2008-08-21 10:21 ` linux-next: manual merge of the ttydev tree Alan Cox
2008-08-21 12:14 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-12-11 6:26 Stephen Rothwell
2008-12-11 10:21 ` Alan Cox
2008-12-11 14:46 ` Dan Williams
2008-09-19 2:57 Stephen Rothwell
2008-09-19 2:53 Stephen Rothwell
2008-08-25 8:33 Stephen Rothwell
2008-08-25 8:24 Stephen Rothwell
2008-08-22 5:51 Stephen Rothwell
2008-08-19 7:43 Stephen Rothwell
2008-08-19 19:57 ` Greg KH
2008-08-18 6:08 Stephen Rothwell
2008-08-14 5:50 Stephen Rothwell
2008-08-12 6:58 Stephen Rothwell
2008-08-12 20:42 ` Greg KH
2008-08-12 6:55 Stephen Rothwell
2008-07-23 6:47 Stephen Rothwell
2008-07-22 6:37 Stephen Rothwell
2008-07-22 10:31 ` Alan Cox
2008-07-21 7:20 Stephen Rothwell
2008-07-18 8:48 Stephen Rothwell
2008-07-18 8:41 Stephen Rothwell
2008-07-18 8:28 Stephen Rothwell
2008-07-18 8:23 Stephen Rothwell
2008-07-18 8:20 Stephen Rothwell
2008-07-18 8:49 ` Alan Cox
2008-07-18 10:49 ` Adrian Bunk
2008-07-18 10:55 ` David Miller
2008-07-18 11:00 ` Adrian Bunk
2008-07-04 9:11 Stephen Rothwell
2008-07-04 15:41 ` Alan Cox
2008-07-01 14:12 Stephen Rothwell
2008-07-01 14:16 ` Alan Cox
2008-07-01 14:09 Stephen Rothwell
2008-07-01 14:14 ` Alan Cox
2008-07-01 14:07 Stephen Rothwell
2008-07-01 14:12 ` Alan Cox
2008-07-01 14:43 ` Adrian Bunk
2008-07-01 15:42 ` Alan Cox
2008-07-01 16:45 ` Adrian Bunk
2008-07-01 14:04 Stephen Rothwell
2008-07-01 13:56 Stephen Rothwell
2008-07-01 13:54 Stephen Rothwell
2008-07-01 13:43 Stephen Rothwell
2008-07-01 12:43 Stephen Rothwell
2008-07-01 14:09 ` Alan Cox
2008-07-01 15:07 ` David Woodhouse
2008-07-01 15:29 ` Alan Cox
2008-07-02 9:01 ` David Woodhouse
2008-07-02 9:17 ` Alan Cox
2008-07-02 9:50 ` David Woodhouse
2008-07-02 9:43 ` Alan Cox
2008-07-01 12:35 Stephen Rothwell
2008-07-01 11:57 Stephen Rothwell
2008-07-01 11:59 ` Felipe Balbi
2008-07-01 15:25 ` Greg KH
2008-07-01 11:44 Stephen Rothwell
2008-07-01 11:37 Stephen Rothwell
2008-07-01 11:33 Stephen Rothwell
2008-07-12 18:59 ` Jesper Juhl
2008-07-12 20:29 ` Alan Cox
2008-07-13 1:20 ` Stephen Rothwell
2008-07-01 11:23 Stephen Rothwell
2008-07-01 11:17 Stephen Rothwell
2008-07-01 11:10 Stephen Rothwell
2008-07-01 11:56 ` Alan Cox
2008-07-01 16:18 ` David Brownell
2008-07-01 16:27 ` Alan Cox
2008-07-01 10:59 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=20080821180308.141bccb7.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alan@lxorguk$(echo .)ukuu.org.uk \
--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