Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 95208
b: refs/heads/master
c: 11fb09b
h: refs/heads/master
v: v3
  • Loading branch information
Harvey Harrison authored and Linus Torvalds committed Apr 30, 2008
1 parent 3f8ef04 commit c834c87
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1a4e2351e7fcf2d10bb5524b0ace7797ffad4d98
refs/heads/master: 11fb09bfabd699a94555b69d6e6c4fa6c3febde8
9 changes: 5 additions & 4 deletions trunk/drivers/char/epca.c
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,8 @@ static int pc_open(struct tty_struct *tty, struct file * filp)
return(-ENODEV);
}

if ((bc = ch->brdchan) == 0) {
bc = ch->brdchan;
if (bc == NULL) {
tty->driver_data = NULL;
return -ENODEV;
}
Expand Down Expand Up @@ -1838,7 +1839,7 @@ static void epcaparam(struct tty_struct *tty, struct channel *ch)
unsigned mval, hflow, cflag, iflag;

bc = ch->brdchan;
epcaassert(bc !=0, "bc out of range");
epcaassert(bc != NULL, "bc out of range");

assertgwinon(ch);
ts = tty->termios;
Expand Down Expand Up @@ -2477,7 +2478,7 @@ static void pc_unthrottle(struct tty_struct *tty)
}
}

void digi_send_break(struct channel *ch, int msec)
static void digi_send_break(struct channel *ch, int msec)
{
unsigned long flags;

Expand Down Expand Up @@ -2865,7 +2866,7 @@ static struct pci_device_id epca_pci_tbl[] = {

MODULE_DEVICE_TABLE(pci, epca_pci_tbl);

int __init init_PCI (void)
static int __init init_PCI(void)
{
memset (&epca_driver, 0, sizeof (epca_driver));
epca_driver.name = "epca";
Expand Down

0 comments on commit c834c87

Please sign in to comment.