diff options
Diffstat (limited to 'drivers/net/pcmcia/xirc2ps_cs.c')
-rw-r--r-- | drivers/net/pcmcia/xirc2ps_cs.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index d6273619686a..69813406782d 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c | |||
@@ -781,13 +781,6 @@ xirc2ps_config(struct pcmcia_device * link) | |||
781 | goto failure; | 781 | goto failure; |
782 | } | 782 | } |
783 | 783 | ||
784 | /* get configuration stuff */ | ||
785 | tuple.DesiredTuple = CISTPL_CONFIG; | ||
786 | if ((err=first_tuple(link, &tuple, &parse))) | ||
787 | goto cis_error; | ||
788 | link->conf.ConfigBase = parse.config.base; | ||
789 | link->conf.Present = parse.config.rmask[0]; | ||
790 | |||
791 | /* get the ethernet address from the CIS */ | 784 | /* get the ethernet address from the CIS */ |
792 | tuple.DesiredTuple = CISTPL_FUNCE; | 785 | tuple.DesiredTuple = CISTPL_FUNCE; |
793 | for (err = first_tuple(link, &tuple, &parse); !err; | 786 | for (err = first_tuple(link, &tuple, &parse); !err; |
@@ -1051,8 +1044,6 @@ xirc2ps_config(struct pcmcia_device * link) | |||
1051 | xirc2ps_release(link); | 1044 | xirc2ps_release(link); |
1052 | return -ENODEV; | 1045 | return -ENODEV; |
1053 | 1046 | ||
1054 | cis_error: | ||
1055 | printk(KNOT_XIRC "unable to parse CIS\n"); | ||
1056 | failure: | 1047 | failure: |
1057 | return -ENODEV; | 1048 | return -ENODEV; |
1058 | } /* xirc2ps_config */ | 1049 | } /* xirc2ps_config */ |