aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Belisko <marek.belisko@open-nandra.com>2011-03-10 05:51:30 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-14 14:51:20 -0400
commita01ffcd69f4987f64e02151575743d756eb4e4d2 (patch)
tree5a10418e60f4358cc8b8ff1b5b7276a8739a7d46
parentbee1b21cfac6c415563e4643826b9d8b9b31b6f8 (diff)
staging: ft1000: Fix coding style in ft1000_open function.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/ft1000/ft1000-usb/ft1000_hw.c25
1 files changed, 12 insertions, 13 deletions
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
index 6a9e5fad414..b5786304880 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -1238,27 +1238,26 @@ static int ft1000_submit_rx_urb(struct ft1000_info *info)
1238// Notes: 1238// Notes:
1239// 1239//
1240//--------------------------------------------------------------------------- 1240//---------------------------------------------------------------------------
1241static int ft1000_open (struct net_device *dev) 1241static int ft1000_open(struct net_device *dev)
1242{ 1242{
1243 struct ft1000_info *pInfo = netdev_priv(dev); 1243 struct ft1000_info *pInfo = netdev_priv(dev);
1244 struct timeval tv; //mbelian 1244 struct timeval tv; //mbelian
1245 int ret; 1245 int ret;
1246 1246
1247 DEBUG("ft1000_open is called for card %d\n", pInfo->CardNumber); 1247 DEBUG("ft1000_open is called for card %d\n", pInfo->CardNumber);
1248 //DEBUG("ft1000_open: dev->addr=%x, dev->addr_len=%d\n", dev->addr, dev->addr_len); 1248 //DEBUG("ft1000_open: dev->addr=%x, dev->addr_len=%d\n", dev->addr, dev->addr_len);
1249 1249
1250 pInfo->stats.rx_bytes = 0; //mbelian 1250 pInfo->stats.rx_bytes = 0; //mbelian
1251 pInfo->stats.tx_bytes = 0; //mbelian 1251 pInfo->stats.tx_bytes = 0; //mbelian
1252 pInfo->stats.rx_packets = 0; //mbelian 1252 pInfo->stats.rx_packets = 0; //mbelian
1253 pInfo->stats.tx_packets = 0; //mbelian 1253 pInfo->stats.tx_packets = 0; //mbelian
1254 do_gettimeofday(&tv); 1254 do_gettimeofday(&tv);
1255 pInfo->ConTm = tv.tv_sec; 1255 pInfo->ConTm = tv.tv_sec;
1256 pInfo->ProgConStat = 0; //mbelian 1256 pInfo->ProgConStat = 0; //mbelian
1257 1257
1258 netif_start_queue(dev);
1258 1259
1259 netif_start_queue(dev); 1260 netif_carrier_on(dev); //mbelian
1260
1261 netif_carrier_on(dev); //mbelian
1262 1261
1263 ret = ft1000_submit_rx_urb(pInfo); 1262 ret = ft1000_submit_rx_urb(pInfo);
1264 1263