diff options
| author | Jens Axboe <axboe@fb.com> | 2017-04-24 22:03:14 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-24 22:03:14 -0600 |
| commit | d9fd363a6cbfae24ffaa00ac6fd3ce8e271acaf1 (patch) | |
| tree | 9139831824ebe9cf77d1bf836b558ee2061c0483 /drivers/virtio/virtio.c | |
| parent | a44f53faf4674d84cba79f7ee574584e18ab8744 (diff) | |
| parent | 8f9cedc76fc7d9bc916127f8fe1287a249891d40 (diff) | |
| download | linux-d9fd363a6cbfae24ffaa00ac6fd3ce8e271acaf1.tar.gz | |
Merge branch 'master' into for-4.12/post-merge
Diffstat (limited to 'drivers/virtio/virtio.c')
| -rw-r--r-- | drivers/virtio/virtio.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c index 400d70b69379..48230a5e12f2 100644 --- a/drivers/virtio/virtio.c +++ b/drivers/virtio/virtio.c @@ -232,6 +232,12 @@ static int virtio_dev_probe(struct device *_d) if (device_features & (1ULL << i)) __virtio_set_bit(dev, i); + if (drv->validate) { + err = drv->validate(dev); + if (err) + goto err; + } + err = virtio_finalize_features(dev); if (err) goto err; |