提交 74375c05 编写于 作者: T Tilman Schmidt 提交者: David S. Miller

ser_gigaset: fix up NULL checks

Commit f34d7a5b ("tty: The big operations rework") changed
tty->driver to tty->ops but left NULL checks for tty->driver untouched.
Fix.
Signed-off-by: NTilman Schmidt <tilman@imap.cc>
[pebolle: removed Fixes tag]
Signed-off-by: NPaul Bolle <pebolle@tiscali.nl>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 389e4e04
...@@ -67,7 +67,7 @@ static int write_modem(struct cardstate *cs) ...@@ -67,7 +67,7 @@ static int write_modem(struct cardstate *cs)
struct sk_buff *skb = bcs->tx_skb; struct sk_buff *skb = bcs->tx_skb;
int sent = -EOPNOTSUPP; int sent = -EOPNOTSUPP;
if (!tty || !tty->driver || !skb) if (!tty || !tty->ops || !skb)
return -EINVAL; return -EINVAL;
if (!skb->len) { if (!skb->len) {
...@@ -109,7 +109,7 @@ static int send_cb(struct cardstate *cs) ...@@ -109,7 +109,7 @@ static int send_cb(struct cardstate *cs)
unsigned long flags; unsigned long flags;
int sent = 0; int sent = 0;
if (!tty || !tty->driver) if (!tty || !tty->ops)
return -EFAULT; return -EFAULT;
cb = cs->cmdbuf; cb = cs->cmdbuf;
...@@ -432,7 +432,7 @@ static int gigaset_set_modem_ctrl(struct cardstate *cs, unsigned old_state, ...@@ -432,7 +432,7 @@ static int gigaset_set_modem_ctrl(struct cardstate *cs, unsigned old_state,
struct tty_struct *tty = cs->hw.ser->tty; struct tty_struct *tty = cs->hw.ser->tty;
unsigned int set, clear; unsigned int set, clear;
if (!tty || !tty->driver || !tty->ops->tiocmset) if (!tty || !tty->ops || !tty->ops->tiocmset)
return -EINVAL; return -EINVAL;
set = new_state & ~old_state; set = new_state & ~old_state;
clear = old_state & ~new_state; clear = old_state & ~new_state;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册