[PATCH 2/2] staging/sm7xxfb: return a proper err for smtc_alloc_fb_info failure

From: Devendra Naga
Date: Tue Jul 10 2012 - 01:49:21 EST


as smtc_alloc_fb_info can fail, but we are returning the 0,
how? because the pci_enable_device succeeded, which makes the probe
return 0, and may cause panics or some strange problems at remove
when driver unloaded by modprobe -r.

so return err properly as smtc_alloc_fb_info is doing kzallocs its
good to do -ENOMEM

Signed-off-by: Devendra Naga <devendra.aaru@xxxxxxxxx>
---
drivers/staging/sm7xxfb/sm7xxfb.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/sm7xxfb/sm7xxfb.c b/drivers/staging/sm7xxfb/sm7xxfb.c
index 0c0b603..7395196 100644
--- a/drivers/staging/sm7xxfb/sm7xxfb.c
+++ b/drivers/staging/sm7xxfb/sm7xxfb.c
@@ -808,8 +808,10 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev,

sfb = smtc_alloc_fb_info(pdev, name);

- if (!sfb)
+ if (!sfb) {
+ err = -ENOMEM;
goto failed_free;
+ }

sfb->chip_id = ent->device;
sprintf(name, "sm%Xfb", sfb->chip_id);
--
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/