]> err.no Git - linux-2.6/blobdiff - drivers/char/n_hdlc.c
random: remove cacheline alignment for locks
[linux-2.6] / drivers / char / n_hdlc.c
index e8332f305d72a77b9e8d0579b8b222d5e66ea0ea..06803ed5568ccbad5c0a2c470d5c060d13b82dfc 100644 (file)
@@ -229,7 +229,7 @@ static void n_hdlc_release(struct n_hdlc *n_hdlc)
        wake_up_interruptible (&tty->read_wait);
        wake_up_interruptible (&tty->write_wait);
 
-       if (tty != NULL && tty->disc_data == n_hdlc)
+       if (tty->disc_data == n_hdlc)
                tty->disc_data = NULL;  /* Break the tty->n_hdlc link */
 
        /* Release transmit and receive buffers */
@@ -501,7 +501,7 @@ static void n_hdlc_tty_receive(struct tty_struct *tty, const __u8 *data,
                        __FILE__,__LINE__, count);
                
        /* This can happen if stuff comes in on the backup tty */
-       if (n_hdlc == 0 || tty != n_hdlc->tty)
+       if (!n_hdlc || tty != n_hdlc->tty)
                return;
                
        /* verify line is using HDLC discipline */