---

yaml
---
r: 359355
b: refs/heads/master
c: 803d9e0
h: refs/heads/master
i:
  359353: 7dccf4c
  359351: 7f6d45c
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57f2667cc7ebf69bd5fdb26f132228d331766ea8
+refs/heads/master: 803d9e043dc31ea2d26442618f0eb020550f8e08

trunk/drivers/mmc/core/host.c

@@ -429,19 +429,20 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
 	int err;
 	struct mmc_host *host;
 
-	if (!idr_pre_get(&mmc_host_idr, GFP_KERNEL))
-		return NULL;
-
 	host = kzalloc(sizeof(struct mmc_host) + extra, GFP_KERNEL);
 	if (!host)
 		return NULL;
 
 	/* scanning will be enabled when we're ready */
 	host->rescan_disable = 1;
+	idr_preload(GFP_KERNEL);
 	spin_lock(&mmc_host_lock);
-	err = idr_get_new(&mmc_host_idr, host, &host->index);
+	err = idr_alloc(&mmc_host_idr, host, 0, 0, GFP_NOWAIT);
+	if (err >= 0)
+		host->index = err;
 	spin_unlock(&mmc_host_lock);
-	if (err)
+	idr_preload_end();
+	if (err < 0)
 		goto free;
 
 	dev_set_name(&host->class_dev, "mmc%d", host->index);