On Fri, Aug 06, 2010 at 11:49:10PM +0400, Kulikov Vasiliy wrote:
> Driver should call disable_pci_device() if it returns from pci_probe()
> with error. Also it must not be called if pci_request_region() fails as
> it means that somebody uses device resources and rules the device.
>
I think we should disable it actually. The comments on
pci_enable_device() and pci_disable_device() say that only the first and
last callers actually enable and disable it. The others just increment
or decrement a counter.
regards,
dan carpenter
> Move pci_enable_device() after checking moxa_boards[] to remove senseless
> pci_enable_device()/pci_disable_device().
>
> Signed-off-by: Kulikov Vasiliy <segooon@xxxxxxxxx>
> ---
> drivers/char/moxa.c | 12 +++++++-----
> 1 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
> index 107b0bd..0ea5aeb 100644
> --- a/drivers/char/moxa.c
> +++ b/drivers/char/moxa.c
> @@ -939,11 +939,6 @@ static int __devinit moxa_pci_probe(struct pci_dev *pdev,
> int board_type = ent->driver_data;
> int retval;
>
> - retval = pci_enable_device(pdev);
> - if (retval) {
> - dev_err(&pdev->dev, "can't enable pci device\n");
> - goto err;
> - }
>
> for (i = 0; i < MAX_BOARDS; i++)
> if (moxa_boards[i].basemem == NULL)
> @@ -956,6 +951,12 @@ static int __devinit moxa_pci_probe(struct pci_dev *pdev,
> goto err;
> }
>
> + retval = pci_enable_device(pdev);
> + if (retval) {
> + dev_err(&pdev->dev, "can't enable pci device\n");
> + goto err;
> + }
> +
> board = &moxa_boards[i];
>
> retval = pci_request_region(pdev, 2, "moxa-base");
> @@ -1001,6 +1002,7 @@ err_base:
> board->basemem = NULL;
> err_reg:
> pci_release_region(pdev, 2);
> + pci_disable_device(pdev);
> err:
> return retval;
> }
> --
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
