Fedora kernel-2.6.17-1.2142_FC4

[linux-2.6.git] / drivers / isdn / tpam / tpam_main.c

diff --git a/drivers/isdn/tpam/tpam_main.c b/drivers/isdn/tpam/tpam_main.c
index 7788f42..e11cb90 100644 (file)
--- a/drivers/isdn/tpam/tpam_main.c
+++ b/drivers/isdn/tpam/tpam_main.c
@@ -39,7 +39,7 @@ MODULE_DESCRIPTION("ISDN4Linux: Driver for TurboPAM ISDN cards");
 MODULE_AUTHOR("Stelian Pop");
 MODULE_LICENSE("GPL");
 MODULE_PARM_DESC(id,"ID-String of the driver");
-MODULE_PARM(id,"s");
+module_param(id, charp, 0);
 
 /*
  * Finds a board by its driver ID.
@@ -105,7 +105,7 @@ static int __devinit tpam_probe(struct pci_dev *dev, const struct pci_device_id
        memset((char *)card, 0, sizeof(tpam_card));
 
        card->irq = dev->irq;
-       card->lock = SPIN_LOCK_UNLOCKED;
+       spin_lock_init(&card->lock);
        sprintf(card->interface.id, "%s%d", id, cards_num);
 
        /* request interrupt */