diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c
index 70db060b4d419..3eaf63a6ecac9 100644
--- a/arch/s390/pci/pci_clp.c
+++ b/arch/s390/pci/pci_clp.c
@@ -179,7 +179,7 @@ int clp_add_pci_device(u32 fid, u32 fh, int configured)
 static int clp_set_pci_fn(u32 *fh, u8 nr_dma_as, u8 command)
 {
 	struct clp_req_rsp_set_pci *rrb;
-	int rc, retries = 1000;
+	int rc, retries = 100;
 
 	rrb = clp_alloc_block(GFP_KERNEL);
 	if (!rrb)
@@ -199,7 +199,7 @@ static int clp_set_pci_fn(u32 *fh, u8 nr_dma_as, u8 command)
 			retries--;
 			if (retries < 0)
 				break;
-			msleep(1);
+			msleep(20);
 		}
 	} while (rrb->response.hdr.rsp == CLP_RC_SETPCIFN_BUSY);