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

Commit 6366213e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
  regulator, mc13xxx: Remove pointless test for unsigned less than zero
  regulator: Fix warning with CONFIG_BUG disabled
parents 4660ba63 4b2f67d7

drivers/regulator/mc13xxx-regulator-core.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static int mc13xxx_regulator_get_voltage(struct regulator_dev *rdev) 


	dev_dbg(rdev_get_dev(rdev), "%s id: %d val: %d\n", __func__, id, val);



	BUG_ON(val < 0 || val > mc13xxx_regulators[id].desc.n_voltages);

	BUG_ON(val > mc13xxx_regulators[id].desc.n_voltages);



	return mc13xxx_regulators[id].voltages[val];

}

drivers/regulator/wm831x-dcdc.c

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ static unsigned int wm831x_dcdc_get_mode(struct regulator_dev *rdev) 
		return REGULATOR_MODE_IDLE;

	default:

		BUG();

		return -EINVAL;

	}

}