diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
| commit | 0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch) | |
| tree | 5085c389f09da78182b899d19fe1068b619a69dd /drivers/char/bw-qcam.c | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'drivers/char/bw-qcam.c')
| -rw-r--r-- | drivers/char/bw-qcam.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; |