From 036b00e0917a867a018c583aa86aa66affb9321c Mon Sep 17 00:00:00 2001 From: Kulikov Vasiliy Date: Mon, 9 Aug 2010 23:51:44 +0400 Subject: staging: crystalhd: call disable_pci_device() if pci_probe() failed Driver should call disable_pci_device() if it returns from pci_probe() with error. Signed-off-by: Kulikov Vasiliy Acked-by: Jarod Wilson Signed-off-by: Greg Kroah-Hartman --- drivers/staging/crystalhd/crystalhd_lnx.c | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/staging/crystalhd') diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c index fbb80f0..115e79b 100644 --- a/drivers/staging/crystalhd/crystalhd_lnx.c +++ b/drivers/staging/crystalhd/crystalhd_lnx.c @@ -570,6 +570,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; } -- cgit v1.1 From cae16a1742ad3cc19f15e78b821b94448e330ad9 Mon Sep 17 00:00:00 2001 From: Vasiliy Kulikov Date: Sun, 12 Sep 2010 22:56:51 +0400 Subject: staging: crystalhd: fix signed bug chd_dec_major is unsigned, so check chd_dec_major < 0 doesn't make sense. Since it is used as signed, declare it as int. Signed-off-by: Vasiliy Kulikov Signed-off-by: Greg Kroah-Hartman --- drivers/staging/crystalhd/crystalhd_lnx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/staging/crystalhd') diff --git a/drivers/staging/crystalhd/crystalhd_lnx.h b/drivers/staging/crystalhd/crystalhd_lnx.h index c951e43..a2b5a56 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 */ -- cgit v1.1 From 1087020fb0b12cdebb8c577ec2d1b26e724a1a7c Mon Sep 17 00:00:00 2001 From: Tracey Dent Date: Thu, 7 Oct 2010 20:01:25 -0400 Subject: Staging: crystalhd: Makefile: replace the use of -objs with -y Changed -objs to -y in Makefile. Signed-off-by: Tracey Dent Signed-off-by: Greg Kroah-Hartman --- drivers/staging/crystalhd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/staging/crystalhd') diff --git a/drivers/staging/crystalhd/Makefile b/drivers/staging/crystalhd/Makefile index e2af0ce..c31657a 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 -- cgit v1.1