diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-05-08 13:35:37 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-05-08 13:35:37 -0400 |
| commit | 7b96c686223a5c902d6a59c7d178f3904f0ab757 (patch) | |
| tree | fe328ed56ad3719de3cfebad72ef74e34f1ed92b /drivers/net/wan/farsync.c | |
| parent | f141ed65f256ec036c7fba604da6b7c448096ef9 (diff) | |
| parent | d48b97b403d23f6df0b990cee652bdf9a52337a3 (diff) | |
Merge tag 'v3.4-rc6' into gpio/next
Linux 3.4-rc6
Diffstat (limited to 'drivers/net/wan/farsync.c')
| -rw-r--r-- | drivers/net/wan/farsync.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c index ebb9f24eefb5..1a623183cbe5 100644 --- a/drivers/net/wan/farsync.c +++ b/drivers/net/wan/farsync.c | |||
| @@ -2483,6 +2483,7 @@ fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 2483 | pr_err("Control memory remap failed\n"); | 2483 | pr_err("Control memory remap failed\n"); |
| 2484 | pci_release_regions(pdev); | 2484 | pci_release_regions(pdev); |
| 2485 | pci_disable_device(pdev); | 2485 | pci_disable_device(pdev); |
| 2486 | iounmap(card->mem); | ||
| 2486 | kfree(card); | 2487 | kfree(card); |
| 2487 | return -ENODEV; | 2488 | return -ENODEV; |
| 2488 | } | 2489 | } |