diff options
Diffstat (limited to 'drivers/bluetooth/bt3c_cs.c')
| -rw-r--r-- | drivers/bluetooth/bt3c_cs.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index 3a96a0babc6a..aae3abace586 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c | |||
| @@ -713,22 +713,7 @@ static int bt3c_config(struct pcmcia_device *link) | |||
| 713 | u_short buf[256]; | 713 | u_short buf[256]; |
| 714 | cisparse_t parse; | 714 | cisparse_t parse; |
| 715 | cistpl_cftable_entry_t *cf = &parse.cftable_entry; | 715 | cistpl_cftable_entry_t *cf = &parse.cftable_entry; |
| 716 | int i, j, try, last_ret, last_fn; | 716 | int i, j, try; |
| 717 | |||
| 718 | tuple.TupleData = (cisdata_t *)buf; | ||
| 719 | tuple.TupleOffset = 0; | ||
| 720 | tuple.TupleDataMax = 255; | ||
| 721 | tuple.Attributes = 0; | ||
| 722 | |||
| 723 | /* Get configuration register information */ | ||
| 724 | tuple.DesiredTuple = CISTPL_CONFIG; | ||
| 725 | last_ret = first_tuple(link, &tuple, &parse); | ||
| 726 | if (last_ret != CS_SUCCESS) { | ||
| 727 | last_fn = ParseTuple; | ||
| 728 | goto cs_failed; | ||
| 729 | } | ||
| 730 | link->conf.ConfigBase = parse.config.base; | ||
| 731 | link->conf.Present = parse.config.rmask[0]; | ||
| 732 | 717 | ||
| 733 | /* First pass: look for a config entry that looks normal. */ | 718 | /* First pass: look for a config entry that looks normal. */ |
| 734 | tuple.TupleData = (cisdata_t *)buf; | 719 | tuple.TupleData = (cisdata_t *)buf; |
| @@ -802,9 +787,6 @@ found_port: | |||
| 802 | 787 | ||
| 803 | return 0; | 788 | return 0; |
| 804 | 789 | ||
| 805 | cs_failed: | ||
| 806 | cs_error(link, last_fn, last_ret); | ||
| 807 | |||
| 808 | failed: | 790 | failed: |
| 809 | bt3c_release(link); | 791 | bt3c_release(link); |
| 810 | return -ENODEV; | 792 | return -ENODEV; |
