diff --git a/[refs] b/[refs] index 87a6f1308e54..4d65d0c796e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae5dd5fcab2d9978e1a0a900a8598b4d92f02657 +refs/heads/master: 46c58127ad544fda69cdab377ca4cb304c61202d diff --git a/trunk/drivers/staging/comedi/comedi_pci.c b/trunk/drivers/staging/comedi/comedi_pci.c index 6f3cdf88f05e..5fad084cfbd4 100644 --- a/trunk/drivers/staging/comedi/comedi_pci.c +++ b/trunk/drivers/staging/comedi/comedi_pci.c @@ -50,9 +50,7 @@ int comedi_pci_enable(struct comedi_device *dev) if (rc < 0) return rc; - rc = pci_request_regions(pcidev, dev->board_name - ? dev->board_name - : dev->driver->driver_name); + rc = pci_request_regions(pcidev, dev->board_name); if (rc < 0) pci_disable_device(pcidev); else