diff options
| author | NeilBrown <neilb@suse.de> | 2014-11-19 14:04:20 +1100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-26 19:09:02 -0800 |
| commit | 4b7e4f8289c1ca60accb6c1baf31984f69bc2771 (patch) | |
| tree | cb5debd8a6f879a77a6481eba8b211d396276da5 /drivers/w1/w1.c | |
| parent | 4b97b27939dd9b9ddbd4058efc96d45bc7163601 (diff) | |
| download | op-kernel-dev-4b7e4f8289c1ca60accb6c1baf31984f69bc2771.zip op-kernel-dev-4b7e4f8289c1ca60accb6c1baf31984f69bc2771.tar.gz | |
w1: support auto-load of w1_bq27000 module.
1/ change request_module call to zero-pad single digit
family numbers. This appears to be the intention of
the code, but not what it actually does.
This means that the alias created for W1_FAMILY_SMEM_01
might actually be useful.
2/ Define a family name for the BQ27000 battery charge monitor.
Unfortunately this is the same number as W1_FAMILY_SMEM_01
so if both a compiled on a system, one module might need to
be blacklisted.
3/ Add a MODULE_ALIAS for the bq27000.
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/w1/w1.c')
| -rw-r--r-- | drivers/w1/w1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index 592f7ed..181f41c 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c @@ -727,7 +727,7 @@ int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn) /* slave modules need to be loaded in a context with unlocked mutex */ mutex_unlock(&dev->mutex); - request_module("w1-family-0x%0x", rn->family); + request_module("w1-family-0x%02x", rn->family); mutex_lock(&dev->mutex); spin_lock(&w1_flock); |
