|
@@ -3156,7 +3156,6 @@ static int __devinit ia_init_one(struct pci_dev *pdev,
|
|
{
|
|
{
|
|
struct atm_dev *dev;
|
|
struct atm_dev *dev;
|
|
IADEV *iadev;
|
|
IADEV *iadev;
|
|
- unsigned long flags;
|
|
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
iadev = kzalloc(sizeof(*iadev), GFP_KERNEL);
|
|
iadev = kzalloc(sizeof(*iadev), GFP_KERNEL);
|
|
@@ -3188,19 +3187,14 @@ static int __devinit ia_init_one(struct pci_dev *pdev,
|
|
ia_dev[iadev_count] = iadev;
|
|
ia_dev[iadev_count] = iadev;
|
|
_ia_dev[iadev_count] = dev;
|
|
_ia_dev[iadev_count] = dev;
|
|
iadev_count++;
|
|
iadev_count++;
|
|
- spin_lock_init(&iadev->misc_lock);
|
|
|
|
- /* First fixes first. I don't want to think about this now. */
|
|
|
|
- spin_lock_irqsave(&iadev->misc_lock, flags);
|
|
|
|
if (ia_init(dev) || ia_start(dev)) {
|
|
if (ia_init(dev) || ia_start(dev)) {
|
|
IF_INIT(printk("IA register failed!\n");)
|
|
IF_INIT(printk("IA register failed!\n");)
|
|
iadev_count--;
|
|
iadev_count--;
|
|
ia_dev[iadev_count] = NULL;
|
|
ia_dev[iadev_count] = NULL;
|
|
_ia_dev[iadev_count] = NULL;
|
|
_ia_dev[iadev_count] = NULL;
|
|
- spin_unlock_irqrestore(&iadev->misc_lock, flags);
|
|
|
|
ret = -EINVAL;
|
|
ret = -EINVAL;
|
|
goto err_out_deregister_dev;
|
|
goto err_out_deregister_dev;
|
|
}
|
|
}
|
|
- spin_unlock_irqrestore(&iadev->misc_lock, flags);
|
|
|
|
IF_EVENT(printk("iadev_count = %d\n", iadev_count);)
|
|
IF_EVENT(printk("iadev_count = %d\n", iadev_count);)
|
|
|
|
|
|
iadev->next_board = ia_boards;
|
|
iadev->next_board = ia_boards;
|