diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-22 09:08:01 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-22 09:08:01 +0100 |
| commit | fd2d11cc8af46f50a71b16590275d5bad550c504 (patch) | |
| tree | 42b171e066c83a19826a6dab3de3c9421db513d3 /drivers/net/netdevsim/dev.c | |
| parent | Merge tag 'soundwire-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire into char-misc-next (diff) | |
| parent | Linux 5.5-rc7 (diff) | |
| download | linux-dev-fd2d11cc8af46f50a71b16590275d5bad550c504.tar.xz linux-dev-fd2d11cc8af46f50a71b16590275d5bad550c504.zip | |
Merge 5.5-rc7 into char-misc-next
We need the char-misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/netdevsim/dev.c')
| -rw-r--r-- | drivers/net/netdevsim/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c index 059711edfc61..4b39aba2e9c4 100644 --- a/drivers/net/netdevsim/dev.c +++ b/drivers/net/netdevsim/dev.c @@ -53,7 +53,7 @@ static ssize_t nsim_dev_take_snapshot_write(struct file *file, get_random_bytes(dummy_data, NSIM_DEV_DUMMY_REGION_SIZE); - id = devlink_region_shapshot_id_get(priv_to_devlink(nsim_dev)); + id = devlink_region_snapshot_id_get(priv_to_devlink(nsim_dev)); err = devlink_region_snapshot_create(nsim_dev->dummy_region, dummy_data, id, kfree); if (err) { |