diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-03-08 16:30:55 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-03-08 16:30:55 -0700 |
| commit | d15c22e78674f9a5bc0de0932a43abe1aafae303 (patch) | |
| tree | 3e4198c44bd2d9184e91647346c66aa95e28f843 /drivers/atm/lanai.c | |
| parent | 0f4954819fb6f840d46076f0dbd313ef5da48f5d (diff) | |
| parent | fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc (diff) | |
| download | kernel-crypto-d15c22e78674f9a5bc0de0932a43abe1aafae303.tar.gz kernel-crypto-d15c22e78674f9a5bc0de0932a43abe1aafae303.tar.xz kernel-crypto-d15c22e78674f9a5bc0de0932a43abe1aafae303.zip | |
Merge commit 'v2.6.29-rc7' into next
Diffstat (limited to 'drivers/atm/lanai.c')
| -rw-r--r-- | drivers/atm/lanai.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c index 144a49f1522..8733a2ea04c 100644 --- a/drivers/atm/lanai.c +++ b/drivers/atm/lanai.c @@ -901,7 +901,7 @@ static int __devinit eeprom_read(struct lanai_dev *lanai) clock_l(); udelay(5); for (i = 128; i != 0; i >>= 1) { /* write command out */ tmp = (lanai->conf1 & ~CONFIG1_PROMDATA) | - (data & i) ? CONFIG1_PROMDATA : 0; + ((data & i) ? CONFIG1_PROMDATA : 0); if (lanai->conf1 != tmp) { set_config1(tmp); udelay(5); /* Let new data settle */ |