Skip to content

Commit

Permalink
Merge branch 'misdn-fixes'
Browse files Browse the repository at this point in the history
Yang Yingliang says:

====================
two fixes for mISDN

This patchset fixes two issues when device_add() returns error.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Nov 2, 2022
2 parents e97c089 + bf00f54 commit ba9169f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/isdn/hardware/mISDN/netjet.c
Original file line number Diff line number Diff line change
Expand Up @@ -956,7 +956,7 @@ nj_release(struct tiger_hw *card)
}
if (card->irq > 0)
free_irq(card->irq, card);
if (card->isac.dch.dev.dev.class)
if (device_is_registered(&card->isac.dch.dev.dev))
mISDN_unregister_device(&card->isac.dch.dev);

for (i = 0; i < 2; i++) {
Expand Down
5 changes: 3 additions & 2 deletions drivers/isdn/mISDN/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -233,11 +233,12 @@ mISDN_register_device(struct mISDNdevice *dev,
if (debug & DEBUG_CORE)
printk(KERN_DEBUG "mISDN_register %s %d\n",
dev_name(&dev->dev), dev->id);
dev->dev.class = &mISDN_class;

err = create_stack(dev);
if (err)
goto error1;

dev->dev.class = &mISDN_class;
dev->dev.platform_data = dev;
dev->dev.parent = parent;
dev_set_drvdata(&dev->dev, dev);
Expand All @@ -249,8 +250,8 @@ mISDN_register_device(struct mISDNdevice *dev,

error3:
delete_stack(dev);
return err;
error1:
put_device(&dev->dev);
return err;

}
Expand Down

0 comments on commit ba9169f

Please sign in to comment.