From: Greg Kroah-Hartman <greg@kroah.com>
Date: Tue, 21 Oct 2014 06:37:44 +0000 (+0800)
Subject: greybus: Merge branch 'gregkh_work' into master
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cc662399dc26740c522f4c10504f9e06e331f4a5;p=openwrt%2Fstaging%2Fblogic.git

greybus: Merge branch 'gregkh_work' into master

This pulls in the battery driver work I did there.
---

cc662399dc26740c522f4c10504f9e06e331f4a5
diff --cc drivers/staging/greybus/battery-gb.c
index a3b2bee77299,eca1d0948705..03c16f7a5301
--- a/drivers/staging/greybus/battery-gb.c
+++ b/drivers/staging/greybus/battery-gb.c
@@@ -125,8 -325,14 +325,15 @@@ int gb_battery_device_init(struct gb_co
  		return -ENOMEM;
  
  	gb->connection = connection;	// FIXME refcount!
 +	connection->private = gb;
  
+ 	/* Check the version */
+ 	retval = get_version(gb);
+ 	if (retval) {
+ 		kfree(gb);
+ 		return retval;
+ 	}
+ 
  	b = &gb->bat;
  	// FIXME - get a better (i.e. unique) name
  	// FIXME - anything else needs to be set?