[PATCH 1/6] pty: Fix documentation

[PATCH 1/6] pty: Fix documentation

[Alan Cox]

From: Alan Cox <alan@redhat.com>

The pty changes and updates for window sizing forgot to correct the
kerneldoc

Signed-off-by: Alan Cox <alan@redhat.com>
---

 drivers/char/pty.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)


diff --git a/drivers/char/pty.c b/drivers/char/pty.c
index 146c976..31038a0 100644
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
@@ -230,9 +230,7 @@ static void pty_set_termios(struct tty_struct *tty,
 /**
  *	pty_do_resize		-	resize event
  *	@tty: tty being resized
- *	@real_tty: real tty (not the same as tty if using a pty/tty pair)
- *	@rows: rows (character)
- *	@cols: cols (character)
+ *	@ws: window size being set.
  *
  *	Update the termios variables and send the neccessary signals to
  *	peform a terminal resize correctly

[PATCH 0/6] Series short description

[Alan Cox]

These are some small fixes that didn't quite make the window. Nothing big here
except in file size. The ti_usb_3410 changes fix a bug in the id handling
code and add support for the mts chips - the handling of the rest isn't changed.

The other bits remove two bogus NULL checks and fix the pty kerneldoc before
Randy Dunlap notices ;)


---

Alan Cox (3):
      usb-serial: remove NULL check
      neo: Remove a bogus NULL check
      pty: Fix documentation

Chris Adams (3):
      ti_usb_3410_5052: add Multi-Tech firmware
      ti_usb_3410_5052: add Multi-Tech modem support
      ti_usb_3410_5052: support alternate firmware


 drivers/char/pty.c                    |    4 
 drivers/serial/jsm/jsm_neo.c          |    3 
 drivers/usb/serial/ti_usb_3410_5052.c |   73 ++-
 drivers/usb/serial/ti_usb_3410_5052.h |    8 
 drivers/usb/serial/usb-serial.c       |    3 
 firmware/Makefile                     |    3 
 firmware/WHENCE                       |   16 +
 firmware/mts_cdma.fw.ihex             |  867 ++++++++++++++++++++++++++++++++
 firmware/mts_edge.fw.ihex             |  881 +++++++++++++++++++++++++++++++++
 firmware/mts_gsm.fw.ihex              |  867 ++++++++++++++++++++++++++++++++
 10 files changed, 2699 insertions(+), 26 deletions(-)
 create mode 100644 firmware/mts_cdma.fw.ihex
 create mode 100644 firmware/mts_edge.fw.ihex
 create mode 100644 firmware/mts_gsm.fw.ihex

-- 
Signature

[PATCH 1/6] pty: Fix documentation

[Alan Cox]

From: Alan Cox <alan@redhat.com>

The pty changes and updates for window sizing forgot to correct the
kerneldoc

Signed-off-by: Alan Cox <alan@redhat.com>
---

 drivers/char/pty.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)


diff --git a/drivers/char/pty.c b/drivers/char/pty.c
index 146c976..31038a0 100644
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
@@ -230,9 +230,7 @@ static void pty_set_termios(struct tty_struct *tty,
 /**
  *	pty_do_resize		-	resize event
  *	@tty: tty being resized
- *	@real_tty: real tty (not the same as tty if using a pty/tty pair)
- *	@rows: rows (character)
- *	@cols: cols (character)
+ *	@ws: window size being set.
  *
  *	Update the termios variables and send the neccessary signals to
  *	peform a terminal resize correctly