From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Aug 2010 16:11:31 +0000 (-0700)
Subject: Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: Ubuntu-5.10.0-12.13~27301
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=58d4ea65b98f154f3326b038eecda32f90b46ea8;p=mirror_ubuntu-hirsute-kernel.git

Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
  mmc_spi: Fix unterminated of_match_table
  of/sparc: fix build regression from of_device changes
  of/device: Replace struct of_device with struct platform_device
---

58d4ea65b98f154f3326b038eecda32f90b46ea8
diff --cc drivers/char/ipmi/ipmi_si_intf.c
index 48330e0fd488,b532d613fb5b..3822b4f49c84
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@@ -2599,15 -2573,10 +2599,15 @@@ static int __devinit ipmi_of_probe(stru
  
  	dev_set_drvdata(&dev->dev, info);
  
 -	return add_smi(info);
 +	if (add_smi(info)) {
 +		kfree(info);
 +		return -EBUSY;
 +	}
 +
 +	return 0;
  }
  
- static int __devexit ipmi_of_remove(struct of_device *dev)
+ static int __devexit ipmi_of_remove(struct platform_device *dev)
  {
  	cleanup_one_si(dev_get_drvdata(&dev->dev));
  	return 0;