diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-09 13:20:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-09 13:20:46 -0700 |
| commit | e1cc1c578055d20d36e084e324001fb5e0355a71 (patch) | |
| tree | 66f448ff64ee69129d246b55d0beccb3ab5b2d77 /drivers/net/wan/ixp4xx_hss.c | |
| parent | 9d34d1a20e8171be819a6c8c4de4eea6104d174e (diff) | |
| parent | 7aa6a4786e70fe826b998d1f95ba911a28546844 (diff) | |
| download | talos-op-linux-e1cc1c578055d20d36e084e324001fb5e0355a71.tar.gz talos-op-linux-e1cc1c578055d20d36e084e324001fb5e0355a71.zip | |
Merge branch 'net-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
Diffstat (limited to 'drivers/net/wan/ixp4xx_hss.c')
| -rw-r--r-- | drivers/net/wan/ixp4xx_hss.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c index 3bf7d3f447db..765a7f5d6aa4 100644 --- a/drivers/net/wan/ixp4xx_hss.c +++ b/drivers/net/wan/ixp4xx_hss.c @@ -1249,7 +1249,7 @@ static int __devinit hss_init_one(struct platform_device *pdev) return -ENOMEM; if ((port->npe = npe_request(0)) == NULL) { - err = -ENOSYS; + err = -ENODEV; goto err_free; } @@ -1311,7 +1311,7 @@ static int __init hss_init_module(void) if ((ixp4xx_read_feature_bits() & (IXP4XX_FEATURE_HDLC | IXP4XX_FEATURE_HSS)) != (IXP4XX_FEATURE_HDLC | IXP4XX_FEATURE_HSS)) - return -ENOSYS; + return -ENODEV; spin_lock_init(&npe_lock); |
