diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-08 12:53:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-08 12:53:43 -0800 |
| commit | 32abeb09abdaa86f42b5ee904fb60bf8012803ad (patch) | |
| tree | 40bdbcf28435787894bffc66d49bdd53640a0e66 /drivers/xen | |
| parent | d90696ed61ddcf2bbe47899f17e667800b89b7b9 (diff) | |
| parent | 1ab134ca3151c55b6fc606857e71d9adb4c355d1 (diff) | |
| download | blackbird-op-linux-32abeb09abdaa86f42b5ee904fb60bf8012803ad.tar.gz blackbird-op-linux-32abeb09abdaa86f42b5ee904fb60bf8012803ad.zip | |
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
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/pvcalls-front.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/xen/pvcalls-front.c b/drivers/xen/pvcalls-front.c index 40caa92bff33..d1e1d8d2b9d5 100644 --- a/drivers/xen/pvcalls-front.c +++ b/drivers/xen/pvcalls-front.c @@ -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")) { |
