diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/hp-plus.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
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 | } |