Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: dv1394: move deprecation message from module init to file open
firewire: core: Remove card from list of cards when enable fails
+12
-5
+8
-1
drivers/firewire/fw-card.c
+8
-1
drivers/firewire/fw-card.c
···
412
412
{
413
413
u32 *config_rom;
414
414
size_t length;
415
+
int err;
415
416
416
417
card->max_receive = max_receive;
417
418
card->link_speed = link_speed;
···
423
422
list_add_tail(&card->link, &card_list);
424
423
mutex_unlock(&card_mutex);
425
424
426
-
return card->driver->enable(card, config_rom, length);
425
+
err = card->driver->enable(card, config_rom, length);
426
+
if (err < 0) {
427
+
mutex_lock(&card_mutex);
428
+
list_del(&card->link);
429
+
mutex_unlock(&card_mutex);
430
+
}
431
+
return err;
427
432
}
428
433
EXPORT_SYMBOL(fw_card_add);
429
434
+4
-4
drivers/ieee1394/dv1394.c
+4
-4
drivers/ieee1394/dv1394.c
···
1823
1823
1824
1824
#endif
1825
1825
1826
+
printk(KERN_INFO "%s: NOTE, the dv1394 interface is unsupported "
1827
+
"and will not be available in the new firewire driver stack. "
1828
+
"Try libraw1394 based programs instead.\n", current->comm);
1829
+
1826
1830
return 0;
1827
1831
}
1828
1832
···
2570
2566
static int __init dv1394_init_module(void)
2571
2567
{
2572
2568
int ret;
2573
-
2574
-
printk(KERN_WARNING
2575
-
"NOTE: The dv1394 driver is unsupported and may be removed in a "
2576
-
"future Linux release. Use raw1394 instead.\n");
2577
2569
2578
2570
cdev_init(&dv1394_cdev, &dv1394_fops);
2579
2571
dv1394_cdev.owner = THIS_MODULE;