Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 228025
b: refs/heads/master
c: 95112cb
h: refs/heads/master
i:
  228023: 1098cb4
v: v3
  • Loading branch information
Marek Belisko authored and Greg Kroah-Hartman committed Nov 10, 2010
1 parent b337535 commit 9f551ed
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 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: d7780865164f2efe3ea2fa6f1ebdf61ecc1f2a4d
refs/heads/master: 95112cb448b5962daeee68db8ee523b71266e28b
6 changes: 4 additions & 2 deletions trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
Original file line number Diff line number Diff line change
Expand Up @@ -1347,6 +1347,7 @@ static int ft1000_open (struct net_device *dev)
{
struct ft1000_info *pInfo = (struct ft1000_info *)netdev_priv(dev);
struct timeval tv; //mbelian
int ret;

DEBUG("ft1000_open is called for card %d\n", pInfo->CardNumber);
//DEBUG("ft1000_open: dev->addr=%x, dev->addr_len=%d\n", dev->addr, dev->addr_len);
Expand All @@ -1364,8 +1365,9 @@ static int ft1000_open (struct net_device *dev)

netif_carrier_on(dev); //mbelian

ft1000_submit_rx_urb(pInfo);
return 0;
ret = ft1000_submit_rx_urb(pInfo);

return ret;
}

//---------------------------------------------------------------------------
Expand Down

0 comments on commit 9f551ed

Please sign in to comment.