Message ID | 1379666181-19546-1-git-send-email-sachin.kamat@linaro.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 09/20/2013 10:36 AM, Sachin Kamat wrote: > Driver core sets driver data to NULL upon failure or remove. > > Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> > Cc: Patrick Boettcher <patrick.boettcher@desy.de> For this patch series: Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Regards, Hans > --- > drivers/media/pci/b2c2/flexcop-pci.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/media/pci/b2c2/flexcop-pci.c b/drivers/media/pci/b2c2/flexcop-pci.c > index 447afbd..8b5e0b3 100644 > --- a/drivers/media/pci/b2c2/flexcop-pci.c > +++ b/drivers/media/pci/b2c2/flexcop-pci.c > @@ -319,7 +319,6 @@ static int flexcop_pci_init(struct flexcop_pci *fc_pci) > > err_pci_iounmap: > pci_iounmap(fc_pci->pdev, fc_pci->io_mem); > - pci_set_drvdata(fc_pci->pdev, NULL); > err_pci_release_regions: > pci_release_regions(fc_pci->pdev); > err_pci_disable_device: > @@ -332,7 +331,6 @@ static void flexcop_pci_exit(struct flexcop_pci *fc_pci) > if (fc_pci->init_state & FC_PCI_INIT) { > free_irq(fc_pci->pdev->irq, fc_pci); > pci_iounmap(fc_pci->pdev, fc_pci->io_mem); > - pci_set_drvdata(fc_pci->pdev, NULL); > pci_release_regions(fc_pci->pdev); > pci_disable_device(fc_pci->pdev); > } > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/pci/b2c2/flexcop-pci.c b/drivers/media/pci/b2c2/flexcop-pci.c index 447afbd..8b5e0b3 100644 --- a/drivers/media/pci/b2c2/flexcop-pci.c +++ b/drivers/media/pci/b2c2/flexcop-pci.c @@ -319,7 +319,6 @@ static int flexcop_pci_init(struct flexcop_pci *fc_pci) err_pci_iounmap: pci_iounmap(fc_pci->pdev, fc_pci->io_mem); - pci_set_drvdata(fc_pci->pdev, NULL); err_pci_release_regions: pci_release_regions(fc_pci->pdev); err_pci_disable_device: @@ -332,7 +331,6 @@ static void flexcop_pci_exit(struct flexcop_pci *fc_pci) if (fc_pci->init_state & FC_PCI_INIT) { free_irq(fc_pci->pdev->irq, fc_pci); pci_iounmap(fc_pci->pdev, fc_pci->io_mem); - pci_set_drvdata(fc_pci->pdev, NULL); pci_release_regions(fc_pci->pdev); pci_disable_device(fc_pci->pdev); }
Driver core sets driver data to NULL upon failure or remove. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Cc: Patrick Boettcher <patrick.boettcher@desy.de> --- drivers/media/pci/b2c2/flexcop-pci.c | 2 -- 1 file changed, 2 deletions(-)