diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /drivers/net/hp-plus.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/hp-plus.c')
| -rw-r--r-- | drivers/net/hp-plus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c index 0486cbe01adb..efdbcad63c67 100644 --- a/drivers/net/hp-plus.c +++ b/drivers/net/hp-plus.c | |||
| @@ -187,8 +187,8 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr) | |||
| 187 | return -EBUSY; | 187 | return -EBUSY; |
| 188 | 188 | ||
| 189 | /* Check for the HP+ signature, 50 48 0x 53. */ | 189 | /* Check for the HP+ signature, 50 48 0x 53. */ |
| 190 | if (inw(ioaddr + HP_ID) != 0x4850 | 190 | if (inw(ioaddr + HP_ID) != 0x4850 || |
| 191 | || (inw(ioaddr + HP_PAGING) & 0xfff0) != 0x5300) { | 191 | (inw(ioaddr + HP_PAGING) & 0xfff0) != 0x5300) { |
| 192 | retval = -ENODEV; | 192 | retval = -ENODEV; |
| 193 | goto out; | 193 | goto out; |
| 194 | } | 194 | } |