diff options
author | 2019-04-21 23:18:44 +0200 | |
---|---|---|
committer | 2019-04-21 23:18:44 +0200 | |
commit | 817de6b85914a3dda72b971c074d4d342965fba0 (patch) | |
tree | df0a4563a04aadb8f8595f72392d66d65797c455 /drivers/staging/most | |
parent | staging: kpc2000: add initial set of Daktronics drivers (diff) | |
parent | Linux 5.1-rc6 (diff) | |
download | linux-817de6b85914a3dda72b971c074d4d342965fba0.tar.gz linux-817de6b85914a3dda72b971c074d4d342965fba0.tar.bz2 linux-817de6b85914a3dda72b971c074d4d342965fba0.zip |
Merge 5.1-rc6 into staging-next
We want the fixes in here as well as this resolves an iio driver merge
issue.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/most')
-rw-r--r-- | drivers/staging/most/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/most/core.c b/drivers/staging/most/core.c index 306db261cdcc..b1f7f707cacd 100644 --- a/drivers/staging/most/core.c +++ b/drivers/staging/most/core.c @@ -1397,7 +1397,7 @@ int most_register_interface(struct most_interface *iface) INIT_LIST_HEAD(&iface->p->channel_list); iface->p->dev_id = id; - snprintf(iface->p->name, STRING_SIZE, "mdev%d", id); + strcpy(iface->p->name, iface->description); iface->dev.init_name = iface->p->name; iface->dev.bus = &mc.bus; iface->dev.parent = &mc.dev; |