]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
jsm: removing the uart structure and filename on error
authorBreno Leitao <leitao@linux.vnet.ibm.com>
Thu, 25 Feb 2010 18:31:49 +0000 (15:31 -0300)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 2 Mar 2010 22:43:24 +0000 (14:43 -0800)
If jsm fails to load, then remove the uart stuff, otherwise,
the things (as files), will be there forever (even when the module
is unloaded). If you try to reload the module, the following message
appears:

kobject_add_internal failed for ttyn1 with -EEXIST, don't try to
register things with the same name in the same directory.

This patch remove the uart things when the driver fails.

Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/serial/jsm/jsm_driver.c

index 108c3e0471fd523ab849d7ebc58d702c0b3ac1d4..12cb5e446a4f07580219360cdb6c61415d218df1 100644 (file)
@@ -179,6 +179,7 @@ static int __devinit jsm_probe_one(struct pci_dev *pdev, const struct pci_device
 
        return 0;
  out_free_irq:
+       jsm_remove_uart_port(brd);
        free_irq(brd->irq, brd);
  out_iounmap:
        iounmap(brd->re_map_membase);