From f00179b26149a39dd45a47ccebcd79c228e81544 Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Sat, 7 Jul 2012 17:35:16 +0530 Subject: [PATCH] --- yaml --- r: 317789 b: refs/heads/master c: b3a87c3767b476a2115a8d9c7aa5496c153d1dc5 h: refs/heads/master i: 317787: 193cd9883b450d46db3f8fb0b64aaa6929bc365c v: v3 --- [refs] | 2 +- trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 95e8573a4642..b37f7e4a9c2f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3bc2311e32daef1b62f45bc5d1da936f4cb31111 +refs/heads/master: b3a87c3767b476a2115a8d9c7aa5496c153d1dc5 diff --git a/trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c index 0bd080c4f1f7..4a8d6426641e 100644 --- a/trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +++ b/trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c @@ -97,11 +97,10 @@ static inline u16 ft1000_read_fifo_len(struct net_device *dev) { struct ft1000_info *info = netdev_priv(dev); - if (info->AsicID == ELECTRABUZZ_ID) { + if (info->AsicID == ELECTRABUZZ_ID) return (ft1000_read_reg(dev, FT1000_REG_UFIFO_STAT) - 16); - } else { + else return (ft1000_read_reg(dev, FT1000_REG_MAG_UFSR) - 16); - } } //---------------------------------------------------------------------------