diff options
| author | Won Kang <wkang77@gmail.com> | 2013-08-16 13:13:44 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-19 15:30:59 -0700 |
| commit | bf0373f1c61dd0e0356aeed4e51786e052bb4de8 (patch) | |
| tree | 26b625071c28bbf76d96f614b23d32550f49cf87 /drivers/staging/gdm724x/gdm_mux.h | |
| parent | 7ee4c1b94958837015f8b8a1db6101810c211a8c (diff) | |
| download | linux-bf0373f1c61dd0e0356aeed4e51786e052bb4de8.tar.bz2 | |
staging: gdm7240: a TTY rewrite according to the latest TTY APIs
Fixed mis-use of mutex for gdm_table. gdm_table is refered to only
inside tty_install and port destrcut, and usb callbacks use internal
reference which was saved during urb submission
Signed-off-by: Won Kang <wonkang@gctsemi.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/gdm724x/gdm_mux.h')
| -rw-r--r-- | drivers/staging/gdm724x/gdm_mux.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/staging/gdm724x/gdm_mux.h b/drivers/staging/gdm724x/gdm_mux.h index d5b0b54dd539..0163b243d3e0 100644 --- a/drivers/staging/gdm724x/gdm_mux.h +++ b/drivers/staging/gdm724x/gdm_mux.h @@ -18,6 +18,8 @@ #include <linux/usb.h> #include <linux/list.h> +#include "gdm_tty.h" + #define PM_NORMAL 0 #define PM_SUSPEND 1 @@ -57,7 +59,10 @@ struct mux_rx { void *mux_dev; u32 offset; u32 len; - int (*callback)(void *data, int len, int tty_index, int minor, + int (*callback)(void *data, + int len, + int tty_index, + struct tty_dev *tty_dev, int complete); }; @@ -78,10 +83,13 @@ struct mux_dev { struct delayed_work work_rx; struct usb_interface *intf; int usb_state; - int (*rx_cb)(void *data, int len, int tty_index, int minor, + int (*rx_cb)(void *data, + int len, + int tty_index, + struct tty_dev *tty_dev, int complete); spinlock_t write_lock; - u8 minor[2]; + struct tty_dev *tty_dev; }; #endif /* _GDM_MUX_H_ */ |