diff options
| author |   Benjamin Fair <benjaminfair@google.com> | 2018-07-06 11:16:03 -0700 |
|---|---|---|
| committer |   Corey Minyard <cminyard@mvista.com> | 2018-08-30 14:55:18 -0500 |
| commit | cd2315d471f45a36cb1329722920d89cd6d3d11f (patch) | |
| tree | 01a8204caf58c38a21784775969309a3850948a7 /drivers/char | |
| parent | Merge tag 'mtd/for-4.19-rc2' of git://git.infradead.org/linux-mtd (diff) | |
| download | linux-dev-cd2315d471f45a36cb1329722920d89cd6d3d11f.tar.xz linux-dev-cd2315d471f45a36cb1329722920d89cd6d3d11f.zip | |
ipmi: kcs_bmc: don't change device name
kcs_bmc_alloc(...) calls dev_set_name(...) which is incorrect as most
bus driver frameworks, platform_driver in particular, assume that they
are able to set the device name themselves.
Signed-off-by: Benjamin Fair <benjaminfair@google.com>
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/ipmi/kcs_bmc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/char/ipmi/kcs_bmc.c b/drivers/char/ipmi/kcs_bmc.c index bb882ab161fe..e6124bd548df 100644 --- a/drivers/char/ipmi/kcs_bmc.c +++ b/drivers/char/ipmi/kcs_bmc.c @@ -16,6 +16,8 @@ #include "kcs_bmc.h" +#define DEVICE_NAME "ipmi-kcs" + #define KCS_MSG_BUFSIZ 1000 #define KCS_ZERO_DATA 0 @@ -429,8 +431,6 @@ struct kcs_bmc *kcs_bmc_alloc(struct device *dev, int sizeof_priv, u32 channel) if (!kcs_bmc) return NULL; - dev_set_name(dev, "ipmi-kcs%u", channel); - spin_lock_init(&kcs_bmc->lock); kcs_bmc->channel = channel; @@ -444,7 +444,8 @@ struct kcs_bmc *kcs_bmc_alloc(struct device *dev, int sizeof_priv, u32 channel) return NULL; kcs_bmc->miscdev.minor = MISC_DYNAMIC_MINOR; - kcs_bmc->miscdev.name = dev_name(dev); + kcs_bmc->miscdev.name = devm_kasprintf(dev, GFP_KERNEL, "%s%u", + DEVICE_NAME, channel); kcs_bmc->miscdev.fops = &kcs_bmc_fops; return kcs_bmc; |