diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-13 10:00:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-13 10:00:15 -0800 |
| commit | 0143832cc96d0bf78486297aad5c8fb2c2ead02a (patch) | |
| tree | 4aa5c06a58da4295a6053fb950e883fb33db82ae /drivers/pcmcia/pd6729.c | |
| parent | f8b372a11cc102b9a0dcc6ac2bd10f0b6b2755a9 (diff) | |
| parent | 106665d937df6eff33c71997a52f7bc3aefa6c12 (diff) | |
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
drivers/pcmcia/soc_common.c: Use printf extension %pV
pcmcia: fix warning in synclink driver
pcmcia/sa1100: don't put machine specific init functions in .init.text
pcmcia/cm4000: fix error code
pd6729: Coding Style fixes
Diffstat (limited to 'drivers/pcmcia/pd6729.c')
| -rw-r--r-- | drivers/pcmcia/pd6729.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c index 8cbfa067171..96c72e90b79 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, return 0; - err_out_free_res2: +err_out_free_res2: if (irq_mode == 1) free_irq(dev->irq, socket); else del_timer_sync(&socket->poll_timer); - err_out_free_res: +err_out_free_res: pci_release_regions(dev); - err_out_disable: +err_out_disable: pci_disable_device(dev); - err_out_free_mem: +err_out_free_mem: kfree(socket); return ret; } |