Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303598
b: refs/heads/master
c: 1c51766
h: refs/heads/master
v: v3
  • Loading branch information
Johan Hovold authored and Greg Kroah-Hartman committed Apr 25, 2012
1 parent 824f68b commit a944e17
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 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: 81d5a6729018ef18dcc1a555144ce91eb3c9abc4
refs/heads/master: 1c5176692457c3f249559d29a69affad7447b326
6 changes: 0 additions & 6 deletions trunk/drivers/usb/serial/oti6858.c
Original file line number Diff line number Diff line change
Expand Up @@ -633,9 +633,6 @@ static int oti6858_tiocmset(struct tty_struct *tty,
dbg("%s(port = %d, set = 0x%08x, clear = 0x%08x)",
__func__, port->number, set, clear);

if (!usb_get_intfdata(port->serial->interface))
return -ENODEV;

/* FIXME: check if this is correct (active high/low) */
spin_lock_irqsave(&priv->lock, flags);
control = priv->pending_setup.control;
Expand Down Expand Up @@ -665,9 +662,6 @@ static int oti6858_tiocmget(struct tty_struct *tty)

dbg("%s(port = %d)", __func__, port->number);

if (!usb_get_intfdata(port->serial->interface))
return -ENODEV;

spin_lock_irqsave(&priv->lock, flags);
pin_state = priv->status.pin_state & PIN_MASK;
spin_unlock_irqrestore(&priv->lock, flags);
Expand Down

0 comments on commit a944e17

Please sign in to comment.