Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: max8649 - fix setting extclk_freq
regulator: fix typo in current units
regulator: fix device_register() error handling
+5
-3
+4
-2
drivers/regulator/core.c
+4
-2
drivers/regulator/core.c
···
700
700
constraints->min_uA != constraints->max_uA) {
701
701
ret = _regulator_get_current_limit(rdev);
702
702
if (ret > 0)
703
-
count += sprintf(buf + count, "at %d uA ", ret / 1000);
703
+
count += sprintf(buf + count, "at %d mA ", ret / 1000);
704
704
}
705
705
706
706
if (constraints->valid_modes_mask & REGULATOR_MODE_FAST)
···
2302
2302
dev_set_name(&rdev->dev, "regulator.%d",
2303
2303
atomic_inc_return(®ulator_no) - 1);
2304
2304
ret = device_register(&rdev->dev);
2305
-
if (ret != 0)
2305
+
if (ret != 0) {
2306
+
put_device(&rdev->dev);
2306
2307
goto clean;
2308
+
}
2307
2309
2308
2310
dev_set_drvdata(&rdev->dev, rdev);
2309
2311
+1
-1
drivers/regulator/max8649.c
+1
-1
drivers/regulator/max8649.c