Commit 5e3bd4e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://

* 'for-linus' of git://
  ieee1394: dv1394: move deprecation message from module init to file open
  firewire: core: Remove card from list of cards when enable fails
parents bcee402e 86431532
......@@ -412,6 +412,7 @@ fw_card_add(struct fw_card *card,
u32 *config_rom;
size_t length;
int err;
card->max_receive = max_receive;
card->link_speed = link_speed;
......@@ -422,7 +423,13 @@ fw_card_add(struct fw_card *card,
list_add_tail(&card->link, &card_list);
return card->driver->enable(card, config_rom, length);
err = card->driver->enable(card, config_rom, length);
if (err < 0) {
return err;
......@@ -1823,6 +1823,10 @@ static int dv1394_open(struct inode *inode, struct file *file)
printk(KERN_INFO "%s: NOTE, the dv1394 interface is unsupported "
"and will not be available in the new firewire driver stack. "
"Try libraw1394 based programs instead.\n", current->comm);
return 0;
......@@ -2567,10 +2571,6 @@ static int __init dv1394_init_module(void)
int ret;
"NOTE: The dv1394 driver is unsupported and may be removed in a "
"future Linux release. Use raw1394 instead.\n");
cdev_init(&dv1394_cdev, &dv1394_fops);
dv1394_cdev.owner = THIS_MODULE;
ret = cdev_add(&dv1394_cdev, IEEE1394_DV1394_DEV, 16);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment