]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ser_gigaset: fix up NULL checks
authorTilman Schmidt <tilman@imap.cc>
Tue, 15 Dec 2015 17:11:28 +0000 (18:11 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 15 Dec 2015 18:24:20 +0000 (13:24 -0500)
Commit f34d7a5b7010 ("tty: The big operations rework") changed
tty->driver to tty->ops but left NULL checks for tty->driver untouched.
Fix.

Signed-off-by: Tilman Schmidt <tilman@imap.cc>
[pebolle: removed Fixes tag]
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/isdn/gigaset/ser-gigaset.c

index 375be509e95f5bd302da79446cb8867f8ecb8ec7..d8771b5d6904ccc666bc3ced6e56a813a5c2b3de 100644 (file)
@@ -67,7 +67,7 @@ static int write_modem(struct cardstate *cs)
        struct sk_buff *skb = bcs->tx_skb;
        int sent = -EOPNOTSUPP;
 
-       if (!tty || !tty->driver || !skb)
+       if (!tty || !tty->ops || !skb)
                return -EINVAL;
 
        if (!skb->len) {
@@ -109,7 +109,7 @@ static int send_cb(struct cardstate *cs)
        unsigned long flags;
        int sent = 0;
 
-       if (!tty || !tty->driver)
+       if (!tty || !tty->ops)
                return -EFAULT;
 
        cb = cs->cmdbuf;
@@ -432,7 +432,7 @@ static int gigaset_set_modem_ctrl(struct cardstate *cs, unsigned old_state,
        struct tty_struct *tty = cs->hw.ser->tty;
        unsigned int set, clear;
 
-       if (!tty || !tty->driver || !tty->ops->tiocmset)
+       if (!tty || !tty->ops || !tty->ops->tiocmset)
                return -EINVAL;
        set = new_state & ~old_state;
        clear = old_state & ~new_state;