Commit 5125ed5b authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'vfio-v3.10-rc5' of git://github.com/awilliam/linux-vfio

Pull vfio fix from Alex Williamson:
 "fix rmmod crash"

* tag 'vfio-v3.10-rc5' of git://github.com/awilliam/linux-vfio:
  vfio: fix crash on rmmod
parents b8e9dbac 9a6aa279
...@@ -1360,7 +1360,7 @@ static const struct file_operations vfio_device_fops = { ...@@ -1360,7 +1360,7 @@ static const struct file_operations vfio_device_fops = {
*/ */
static char *vfio_devnode(struct device *dev, umode_t *mode) static char *vfio_devnode(struct device *dev, umode_t *mode)
{ {
if (MINOR(dev->devt) == 0) if (mode && (MINOR(dev->devt) == 0))
*mode = S_IRUGO | S_IWUGO; *mode = S_IRUGO | S_IWUGO;
return kasprintf(GFP_KERNEL, "vfio/%s", dev_name(dev)); return kasprintf(GFP_KERNEL, "vfio/%s", dev_name(dev));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment