diff options
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 e2af0ce2e79..c31657a9335 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 af258991fe7..28c6b8ced42 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 c951e43cbb3..a2b5a56be6d 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 */ |