Merge branch 'master' into next

Signed-off-by: David Ahern <dsahern@gmail.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/devlink/devlink.c b/devlink/devlink.c
index f48ff6c2..6e2115b6 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -3066,11 +3066,13 @@ static int cmd_dev_flash(struct dl *dl)
 		/* In child, just execute the flash and pass returned
 		 * value through pipe once it is done.
 		 */
+		int cc;
+
 		close(pipe_r);
 		err = _mnlg_socket_send(dl->nlg, nlh);
-		write(pipe_w, &err, sizeof(err));
+		cc = write(pipe_w, &err, sizeof(err));
 		close(pipe_w);
-		exit(0);
+		exit(cc != sizeof(err));
 	}
 	close(pipe_w);