diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-04-08 10:56:20 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-08 11:39:19 -0700 |
| commit | 46c58127ad544fda69cdab377ca4cb304c61202d (patch) | |
| tree | 24b9a8f22c8d6a1283be7bd7f82d0f0a01594ae7 | |
| parent | ae5dd5fcab2d9978e1a0a900a8598b4d92f02657 (diff) | |
staging: comedi: comedi_pci: dev->board_name is always valid
The dev->board_name is always initialized before calling the(*attach)
or (*auto_attach) function. It's no longer necessary to validate the
pointer in comedi_pci_enable().
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/comedi_pci.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/comedi/comedi_pci.c b/drivers/staging/comedi/comedi_pci.c index 6f3cdf88f05e..5fad084cfbd4 100644 --- a/drivers/staging/comedi/comedi_pci.c +++ b/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 |