diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-16 09:02:59 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-16 09:02:59 +0200 |
| commit | a30514a076cfe4b1962980e946a759f5556cf4a5 (patch) | |
| tree | bd1238ee26ffaa2940f536da52e77eb576f87549 /drivers/ptp | |
| parent | Merge tag 'iio-for-5.15a' of https://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | Linux 5.14-rc6 (diff) | |
| download | linux-a30514a076cfe4b1962980e946a759f5556cf4a5.tar.xz linux-a30514a076cfe4b1962980e946a759f5556cf4a5.zip | |
Merge 5.14-rc6 into staging-next
We need the IIO fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/ptp')
| -rw-r--r-- | drivers/ptp/ptp_sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c index b3d96b747292..41b92dc2f011 100644 --- a/drivers/ptp/ptp_sysfs.c +++ b/drivers/ptp/ptp_sysfs.c @@ -154,7 +154,7 @@ static int unregister_vclock(struct device *dev, void *data) struct ptp_clock *ptp = dev_get_drvdata(dev); struct ptp_clock_info *info = ptp->info; struct ptp_vclock *vclock; - u8 *num = data; + u32 *num = data; vclock = info_to_vclock(info); dev_info(dev->parent, "delete virtual clock ptp%d\n", |