Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f96c3bbe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-ucb

parents ec384d29 585f5457

drivers/mfd/ucb1x00-core.c

+11 −11
Original line number Diff line number Diff line
@@ -457,6 +457,17 @@ static int ucb1x00_detect_irq(struct ucb1x00 *ucb) 
	return probe_irq_off(mask);

}



static void ucb1x00_release(struct class_device *dev)

{

	struct ucb1x00 *ucb = classdev_to_ucb1x00(dev);

	kfree(ucb);

}



static struct class ucb1x00_class = {

	.name		= "ucb1x00",

	.release	= ucb1x00_release,

};



static int ucb1x00_probe(struct mcp *mcp)

{

	struct ucb1x00 *ucb;
@@ -546,17 +557,6 @@ static void ucb1x00_remove(struct mcp *mcp) 
	class_device_unregister(&ucb->cdev);

}



static void ucb1x00_release(struct class_device *dev)

{

	struct ucb1x00 *ucb = classdev_to_ucb1x00(dev);

	kfree(ucb);

}



static struct class ucb1x00_class = {

	.name		= "ucb1x00",

	.release	= ucb1x00_release,

};



int ucb1x00_register_driver(struct ucb1x00_driver *drv)

{

	struct ucb1x00 *ucb;