diff options
-rw-r--r-- | drivers/pcmcia/pd6729.c | 8 | ||||
-rw-r--r-- | drivers/pcmcia/pd6729.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c index 8cbfa067171f..96c72e90b79c 100644 --- a/drivers/pcmcia/pd6729.c +++ b/drivers/pcmcia/pd6729.c | |||
@@ -725,17 +725,17 @@ static int __devinit pd6729_pci_probe(struct pci_dev *dev, | |||
725 | 725 | ||
726 | return 0; | 726 | return 0; |
727 | 727 | ||
728 | err_out_free_res2: | 728 | err_out_free_res2: |
729 | if (irq_mode == 1) | 729 | if (irq_mode == 1) |
730 | free_irq(dev->irq, socket); | 730 | free_irq(dev->irq, socket); |
731 | else | 731 | else |
732 | del_timer_sync(&socket->poll_timer); | 732 | del_timer_sync(&socket->poll_timer); |
733 | err_out_free_res: | 733 | err_out_free_res: |
734 | pci_release_regions(dev); | 734 | pci_release_regions(dev); |
735 | err_out_disable: | 735 | err_out_disable: |
736 | pci_disable_device(dev); | 736 | pci_disable_device(dev); |
737 | 737 | ||
738 | err_out_free_mem: | 738 | err_out_free_mem: |
739 | kfree(socket); | 739 | kfree(socket); |
740 | return ret; | 740 | return ret; |
741 | } | 741 | } |
diff --git a/drivers/pcmcia/pd6729.h b/drivers/pcmcia/pd6729.h index 41418d394c55..c8e84bdece38 100644 --- a/drivers/pcmcia/pd6729.h +++ b/drivers/pcmcia/pd6729.h | |||
@@ -15,7 +15,7 @@ | |||
15 | struct pd6729_socket { | 15 | struct pd6729_socket { |
16 | int number; | 16 | int number; |
17 | int card_irq; | 17 | int card_irq; |
18 | unsigned long io_base; /* base io address of the socket */ | 18 | unsigned long io_base; /* base io address of the socket */ |
19 | struct pcmcia_socket socket; | 19 | struct pcmcia_socket socket; |
20 | struct timer_list poll_timer; | 20 | struct timer_list poll_timer; |
21 | }; | 21 | }; |