From 0ae8dceaebe3659ee0c3352c08125f403e77ebca Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 28 Sep 1999 22:25:29 +0000 Subject: Merge with 2.3.10. --- drivers/char/bw-qcam.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'drivers/char/bw-qcam.c') diff --git a/drivers/char/bw-qcam.c b/drivers/char/bw-qcam.c index 87821edf8..29cdac314 100644 --- a/drivers/char/bw-qcam.c +++ b/drivers/char/bw-qcam.c @@ -159,6 +159,8 @@ static struct qcam_device *qcam_init(struct parport *port) struct qcam_device *q; q = kmalloc(sizeof(struct qcam_device), GFP_KERNEL); + if(q==NULL) + return NULL; q->pport = port; q->pdev = parport_register_device(port, "bw-qcam", NULL, NULL, @@ -1045,7 +1047,7 @@ void cleanup_module(void) close_bwqcam(qcams[i]); } #else -__initfunc(int init_bw_qcams(struct video_init *unused)) +int __init init_bw_qcams(struct video_init *unused) { struct parport *port; -- cgit v1.2.3