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

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

drivers/vfio/vfio.c

+1 −1
Original line number Diff line number Diff line
@@ -1360,7 +1360,7 @@ static const struct file_operations vfio_device_fops = { 
 */

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;



	return kasprintf(GFP_KERNEL, "vfio/%s", dev_name(dev));