Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32abeb09 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-4.15-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen fixes from Juergen Gross:
 "Just two small fixes for the new pvcalls frontend driver"

* tag 'for-linus-4.15-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/pvcalls: Fix a check in pvcalls_front_remove()
  xen/pvcalls: check for xenbus_read() errors
parents d90696ed 1ab134ca

drivers/xen/pvcalls-front.c

+3 −1
Original line number Diff line number Diff line
@@ -1103,7 +1103,7 @@ static int pvcalls_front_remove(struct xenbus_device *dev) 
			kfree(map);

		}

	}

	if (bedata->ref >= 0)

	if (bedata->ref != -1)

		gnttab_end_foreign_access(bedata->ref, 0, 0);

	kfree(bedata->ring.sring);

	kfree(bedata);
@@ -1128,6 +1128,8 @@ static int pvcalls_front_probe(struct xenbus_device *dev, 
	}



	versions = xenbus_read(XBT_NIL, dev->otherend, "versions", &len);

	if (IS_ERR(versions))

		return PTR_ERR(versions);

	if (!len)

		return -EINVAL;

	if (strcmp(versions, "1")) {