diff for duplicates of <1363037813.27803.12.camel@thor.lan> diff --git a/a/1.txt b/N1/1.txt index 08fa191..ce1c30d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -66,7 +66,7 @@ On Mon, 2013-03-11 at 16:44 -0400, Peter Hurley wrote: > +++ b/drivers/net/ppp/ppp_async.c > @@ -314,7 +314,7 @@ ppp_asynctty_ioctl(struct tty_struct *tty, struct file *file, > /* flush our buffers and the serial port's buffer */ -> if (arg = TCIOFLUSH || arg = TCOFLUSH) +> if (arg == TCIOFLUSH || arg == TCOFLUSH) > ppp_async_flush_output(ap); > - err = tty_perform_flush(tty, arg); > + err = n_tty_ioctl_helper(tty, file, cmd, arg); @@ -79,7 +79,7 @@ On Mon, 2013-03-11 at 16:44 -0400, Peter Hurley wrote: > +++ b/drivers/net/ppp/ppp_synctty.c > @@ -355,7 +355,7 @@ ppp_synctty_ioctl(struct tty_struct *tty, struct file *file, > /* flush our buffers and the serial port's buffer */ -> if (arg = TCIOFLUSH || arg = TCOFLUSH) +> if (arg == TCIOFLUSH || arg == TCOFLUSH) > ppp_sync_flush_output(ap); > - err = tty_perform_flush(tty, arg); > + err = n_tty_ioctl_helper(tty, file, cmd, arg); diff --git a/a/content_digest b/N1/content_digest index 7957c08..c14a41c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\01363034704-28036-26-git-send-email-peter@hurleysoftware.com\0" "From\0Peter Hurley <peter@hurleysoftware.com>\0" "Subject\0Re: [PATCH v5 25/44] tty: Fix recursive deadlock in tty_perform_flush()\0" - "Date\0Mon, 11 Mar 2013 21:36:53 +0000\0" + "Date\0Mon, 11 Mar 2013 17:36:53 -0400\0" "To\0Peter Hurley <peter@hurleysoftware.com>\0" "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>" Jiri Slaby <jslaby@suse.cz> @@ -86,7 +86,7 @@ "> +++ b/drivers/net/ppp/ppp_async.c\n" "> @@ -314,7 +314,7 @@ ppp_asynctty_ioctl(struct tty_struct *tty, struct file *file,\n" "> \t\t/* flush our buffers and the serial port's buffer */\n" - "> \t\tif (arg = TCIOFLUSH || arg = TCOFLUSH)\n" + "> \t\tif (arg == TCIOFLUSH || arg == TCOFLUSH)\n" "> \t\t\tppp_async_flush_output(ap);\n" "> -\t\terr = tty_perform_flush(tty, arg);\n" "> +\t\terr = n_tty_ioctl_helper(tty, file, cmd, arg);\n" @@ -99,7 +99,7 @@ "> +++ b/drivers/net/ppp/ppp_synctty.c\n" "> @@ -355,7 +355,7 @@ ppp_synctty_ioctl(struct tty_struct *tty, struct file *file,\n" "> \t\t/* flush our buffers and the serial port's buffer */\n" - "> \t\tif (arg = TCIOFLUSH || arg = TCOFLUSH)\n" + "> \t\tif (arg == TCIOFLUSH || arg == TCOFLUSH)\n" "> \t\t\tppp_sync_flush_output(ap);\n" "> -\t\terr = tty_perform_flush(tty, arg);\n" "> +\t\terr = n_tty_ioctl_helper(tty, file, cmd, arg);\n" @@ -166,4 +166,4 @@ "> \t\t/* Try the mode commands */\n" "> \t\treturn tty_mode_ioctl(tty, file, cmd, arg);" -38c20838375b0391df3db0ca82cb55e1e5bf7c9bd9f4b7aa547c932714df68d0 +b85217efdfe53db2aed8546b918d7c706b2ed375983afdd0695d27af1fbcacbc
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.