Commit ba9169f5 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'misdn-fixes' 



Yang Yingliang says:

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

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e97c089d bf00f542

drivers/isdn/hardware/mISDN/netjet.c

+1 −1
Original line number Diff line number Diff line
@@ -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++) {

drivers/isdn/mISDN/core.c

+3 −2
Original line number Diff line number Diff line
@@ -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);
@@ -249,8 +250,8 @@ mISDN_register_device(struct mISDNdevice *dev, 


error3:

	delete_stack(dev);

	return err;

error1:

	put_device(&dev->dev);

	return err;



}