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/crystalhd | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
| download | linux-stable-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz linux-stable-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.bz2 linux-stable-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip | |
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/crystalhd')
| -rw-r--r-- | drivers/staging/crystalhd/Makefile | 2 | ||||
| -rw-r--r-- | drivers/staging/crystalhd/crystalhd_lnx.c | 1 | ||||
| -rw-r--r-- | drivers/staging/crystalhd/crystalhd_lnx.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/crystalhd/Makefile b/drivers/staging/crystalhd/Makefile index e2af0ce2e792..c31657a9335f 100644 --- a/drivers/staging/crystalhd/Makefile +++ b/drivers/staging/crystalhd/Makefile @@ -1,6 +1,6 @@ obj-$(CONFIG_CRYSTALHD) += crystalhd.o -crystalhd-objs := crystalhd_cmds.o \ +crystalhd-y := crystalhd_cmds.o \ crystalhd_hw.o \ crystalhd_lnx.o \ crystalhd_misc.o diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c index af258991fe7f..28c6b8ced424 100644 --- a/drivers/staging/crystalhd/crystalhd_lnx.c +++ b/drivers/staging/crystalhd/crystalhd_lnx.c @@ -571,6 +571,7 @@ static int __devinit chd_dec_pci_probe(struct pci_dev *pdev, rc = chd_pci_reserve_mem(pinfo); if (rc) { BCMLOG_ERR("Failed to setup memory regions.\n"); + pci_disable_device(pdev); return -ENOMEM; } diff --git a/drivers/staging/crystalhd/crystalhd_lnx.h b/drivers/staging/crystalhd/crystalhd_lnx.h index c951e43cbb3d..a2b5a56be6dd 100644 --- a/drivers/staging/crystalhd/crystalhd_lnx.h +++ b/drivers/staging/crystalhd/crystalhd_lnx.h @@ -76,7 +76,7 @@ struct crystalhd_adp { spinlock_t lock; /* API Related */ - unsigned int chd_dec_major; + int chd_dec_major; unsigned int cfg_users; struct crystalhd_ioctl_data *idata_free_head; /* ioctl data pool */ |