VisionFive2 Linux kernel

author: Linus Torvalds <torvalds@linux-foundation.org> 2017-02-28 20:29:41 -0800 committer: Linus Torvalds <torvalds@linux-foundation.org> 2017-02-28 20:29:41 -0800 commit: cf393195c3ba5d4c0a8e237eb00f7ef104876ee5 parent: 5ecc5ac215bc4d88243a2f4909e70ccc1bda710f

Commit Summary:

Merge branch 'idr-4.11' of git://git.infradead.org/users/willy/linux-dax

Diffstat:

1 file changed, 2 insertions, 3 deletions

diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index cb28579e8a94..d879f3bca107 100644
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -1980,13 +1980,12 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
 	card->lbfqc = ns_stat_lfbqc_get(stat);
 
 	id = le32_to_cpu(rsqe->buffer_handle);
-	skb = idr_find(&card->idr, id);
+	skb = idr_remove(&card->idr, id);
 	if (!skb) {
 		RXPRINTK(KERN_ERR
-			 "nicstar%d: idr_find() failed!\n", card->index);
+			 "nicstar%d: skb not found!\n", card->index);
 		return;
 	}
-	idr_remove(&card->idr, id);
 	dma_sync_single_for_cpu(&card->pcidev->dev,
 				NS_PRV_DMA(skb),
 				(NS_PRV_BUFTYPE(skb) == BUF_SM