diff --git a/[refs] b/[refs]
index af47d16ea210..a0cc4b1adcdd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab37813f4093a5f59cb8e083cde277289dc72ed3
+refs/heads/master: 5da50988a1bf8c05611db77521777baaca14da29
diff --git a/trunk/drivers/power/sbs-battery.c b/trunk/drivers/power/sbs-battery.c
index a5b6849d4123..a65e8f54157e 100644
--- a/trunk/drivers/power/sbs-battery.c
+++ b/trunk/drivers/power/sbs-battery.c
@@ -469,7 +469,7 @@ static int sbs_get_property(struct power_supply *psy,
 
 	case POWER_SUPPLY_PROP_TECHNOLOGY:
 		val->intval = POWER_SUPPLY_TECHNOLOGY_LION;
-		break;
+		goto done; /* don't trigger power_supply_changed()! */
 
 	case POWER_SUPPLY_PROP_ENERGY_NOW:
 	case POWER_SUPPLY_PROP_ENERGY_FULL: