Commit 11d2498f authored by Dan Williams's avatar Dan Williams
Browse files

Merge branch 'for-5.12/dax' into libnvdimm-fixes 

Pick up dax compile fix.
parents a2948b17 9de82caa

drivers/dax/bus.c

+2 −4
Original line number Diff line number Diff line
@@ -90,13 +90,11 @@ static ssize_t do_id_store(struct device_driver *drv, const char *buf, 
				list_add(&dax_id->list, &dax_drv->ids);

			} else

				rc = -ENOMEM;

		} else

			/* nothing to remove */;

		}

	} else if (action == ID_REMOVE) {

		list_del(&dax_id->list);

		kfree(dax_id);

	} else

		/* dax_id already added */;

	}

	mutex_unlock(&dax_bus_lock);



	if (rc < 0)