From 88d80bb0a376715621418ceb39f73d1b1eb64d42 Mon Sep 17 00:00:00 2001 From: Alexey Khoroshilov Date: Thu, 3 Jan 2013 00:06:47 +0400 Subject: [PATCH] --- yaml --- r: 351821 b: refs/heads/master c: 6960af6dce1f0b2d9d1b4ddf75952d54e633b923 h: refs/heads/master i: 351819: 30b1a07cfdb7984f60f4907420b93173e20c56d9 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/p54/p54pci.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 140124c0536d..0e2d3ea5f976 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40a23296854dded596fda33e0df4a7373229d75e +refs/heads/master: 6960af6dce1f0b2d9d1b4ddf75952d54e633b923 diff --git a/trunk/drivers/net/wireless/p54/p54pci.c b/trunk/drivers/net/wireless/p54/p54pci.c index 933e5d941937..57e3af8ebb4b 100644 --- a/trunk/drivers/net/wireless/p54/p54pci.c +++ b/trunk/drivers/net/wireless/p54/p54pci.c @@ -559,6 +559,7 @@ static int p54p_probe(struct pci_dev *pdev, mem_len = pci_resource_len(pdev, 0); if (mem_len < sizeof(struct p54p_csr)) { dev_err(&pdev->dev, "Too short PCI resources\n"); + err = -ENODEV; goto err_disable_dev; } @@ -568,8 +569,10 @@ static int p54p_probe(struct pci_dev *pdev, goto err_disable_dev; } - if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) || - pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) { + err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); + if (!err) + err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); + if (err) { dev_err(&pdev->dev, "No suitable DMA available\n"); goto err_free_reg; }