Commit 39e926c3 authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Paolo Abeni
Browse files

ptp: vmclock: Don't unregister misc device if it was not registered 



vmclock_remove() tries to detect the successful registration of the misc
device based on the value of its minor value.
However that check is incorrect if the misc device registration was not
attempted in the first place.

Always initialize the minor number, so the check works properly.

Fixes: 20503272 ("ptp: Add support for the AMZNC10C 'vmclock' device")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarThomas Weißschuh <thomas.weissschuh@linutronix.de>
Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Reviewed-by: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent f7d07cd4

drivers/ptp/ptp_vmclock.c

+2 −1
Original line number Diff line number Diff line
@@ -550,6 +550,8 @@ static int vmclock_probe(struct platform_device *pdev) 
		goto out;

	}



	st->miscdev.minor = MISC_DYNAMIC_MINOR;



	/*

	 * If the structure is big enough, it can be mapped to userspace.

	 * Theoretically a guest OS even using larger pages could still
@@ -557,7 +559,6 @@ static int vmclock_probe(struct platform_device *pdev) 
	 * cross that bridge if/when we come to it.

	 */

	if (le32_to_cpu(st->clk->size) >= PAGE_SIZE) {

		st->miscdev.minor = MISC_DYNAMIC_MINOR;

		st->miscdev.fops = &vmclock_miscdev_fops;

		st->miscdev.name = st->name;