Merge branch 'release/v3.0.3' into master

0ad5fdb0 · Federico Vaga · 8bef31c9 · 68bd706f · 0ad5fdb0 · 0ad5fdb0
Commit 0ad5fdb0 authored Oct 07, 2020 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

CHANGELOG.rst CHANGELOG.rst +9 -0

fd-zio.c software/kernel/fd-zio.c +1 -0

No files found.
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,15 @@
 Changelog
 =========

+3.0.3 - 2020-10-07
+==================
+
+Changed
+-------
+- drv: ZIO device parent is, correctly, the Fine-Delay platform
+  device. Before it did not have any parent so this change should not
+  break anything.
+
 3.0.2 - 2020-09-25
 ==================


--- a/software/kernel/fd-zio.c
+++ b/software/kernel/fd-zio.c
@@ -890,6 +890,7 @@ int fd_zio_init(struct fd_dev *fd)
 	/* Mandatory fields */
 	fd->hwzdev->owner = THIS_MODULE;
 	fd->hwzdev->priv_d = fd;
+	fd->hwzdev->head.dev.parent = &fd->pdev->dev;

 	err = zio_register_device(fd->hwzdev, "fd", fd->pdev->id);
 	if (err) {