diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/solo6x10/solo6010-core.c | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/solo6x10/solo6010-core.c')
-rw-r--r-- | drivers/staging/solo6x10/solo6010-core.c | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/drivers/staging/solo6x10/solo6010-core.c b/drivers/staging/solo6x10/solo6010-core.c index 98c6739..4a051cd 100644 --- a/drivers/staging/solo6x10/solo6010-core.c +++ b/drivers/staging/solo6x10/solo6010-core.c @@ -136,23 +136,26 @@ static int __devinit solo6010_pci_probe(struct pci_dev *pdev, int ret; int sdram; u8 chip_id; - - if ((solo_dev = kzalloc(sizeof(*solo_dev), GFP_KERNEL)) == NULL) + solo_dev = kzalloc(sizeof(*solo_dev), GFP_KERNEL); + if (solo_dev == NULL) return -ENOMEM; solo_dev->pdev = pdev; spin_lock_init(&solo_dev->reg_io_lock); pci_set_drvdata(pdev, solo_dev); - if ((ret = pci_enable_device(pdev))) + ret = pci_enable_device(pdev); + if (ret) goto fail_probe; pci_set_master(pdev); - if ((ret = pci_request_regions(pdev, SOLO6010_NAME))) + ret = pci_request_regions(pdev, SOLO6010_NAME); + if (ret) goto fail_probe; - if ((solo_dev->reg_base = pci_ioremap_bar(pdev, 0)) == NULL) { + solo_dev->reg_base = pci_ioremap_bar(pdev, 0); + if (solo_dev->reg_base == NULL) { ret = -ENOMEM; goto fail_probe; } @@ -198,7 +201,8 @@ static int __devinit solo6010_pci_probe(struct pci_dev *pdev, /* Handle this from the start */ solo6010_irq_on(solo_dev, SOLO_IRQ_PCI_ERR); - if ((ret = solo_i2c_init(solo_dev))) + ret = solo_i2c_init(solo_dev); + if (ret) goto fail_probe; /* Setup the DMA engine */ @@ -210,28 +214,36 @@ static int __devinit solo6010_pci_probe(struct pci_dev *pdev, SOLO_DMA_CTRL_READ_CLK_SELECT | SOLO_DMA_CTRL_LATENCY(1)); - if ((ret = solo_p2m_init(solo_dev))) + ret = solo_p2m_init(solo_dev); + if (ret) goto fail_probe; - if ((ret = solo_disp_init(solo_dev))) + ret = solo_disp_init(solo_dev); + if (ret) goto fail_probe; - if ((ret = solo_gpio_init(solo_dev))) + ret = solo_gpio_init(solo_dev); + if (ret) goto fail_probe; - if ((ret = solo_tw28_init(solo_dev))) + ret = solo_tw28_init(solo_dev); + if (ret) goto fail_probe; - if ((ret = solo_v4l2_init(solo_dev))) + ret = solo_v4l2_init(solo_dev); + if (ret) goto fail_probe; - if ((ret = solo_enc_init(solo_dev))) + ret = solo_enc_init(solo_dev); + if (ret) goto fail_probe; - if ((ret = solo_enc_v4l2_init(solo_dev))) + ret = solo_enc_v4l2_init(solo_dev); + if (ret) goto fail_probe; - if ((ret = solo_g723_init(solo_dev))) + ret = solo_g723_init(solo_dev); + if (ret) goto fail_probe; return 0; |