From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 2 Sep 2021 03:00:58 +0000 (+1000)
Subject: Merge remote-tracking branch 'vhost/linux-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7200ee8bacd7832b424d1f7143ae0295323daecf;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'vhost/linux-next'

# Conflicts:
#	drivers/virtio/virtio.c
#	include/uapi/linux/virtio_ids.h
---

7200ee8bacd7832b424d1f7143ae0295323daecf
diff --cc drivers/virtio/virtio.c
index 1ea0c1f6a1fd,c46cc1fbc7ae..588e02fb91d3
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@@ -292,6 -293,10 +293,8 @@@ static void virtio_dev_remove(struct de
  
  	/* Acknowledge the device's existence again. */
  	virtio_add_status(dev, VIRTIO_CONFIG_S_ACKNOWLEDGE);
+ 
+ 	of_node_put(dev->dev.of_node);
 -
 -	return 0;
  }
  
  static struct bus_type virtio_bus = {