diff options
| author | Alan <gnomes@lxorguk.ukuu.org.uk> | 2013-12-03 16:11:04 +0000 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-12-19 20:56:28 -0800 |
| commit | 603f202e9eb083671f35f07cfe6be3e062c7ee31 (patch) | |
| tree | 06ee6fdf4e1ad63f745375349531cf94c695edd5 /drivers/scsi | |
| parent | 769989a4a09d7c825e182cf60604c06d8f2f70e4 (diff) | |
| download | op-kernel-dev-603f202e9eb083671f35f07cfe6be3e062c7ee31.zip op-kernel-dev-603f202e9eb083671f35f07cfe6be3e062c7ee31.tar.gz | |
[SCSI] mac_scsi: Fix crash on out of memory
Missing check on scsi_register
Signed-off-by: Alan Cox <gnomes@lxorguk.ukuu.org.uk>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/mac_scsi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c index 8580757..f5cdc68 100644 --- a/drivers/scsi/mac_scsi.c +++ b/drivers/scsi/mac_scsi.c @@ -260,6 +260,8 @@ int __init macscsi_detect(struct scsi_host_template * tpnt) /* Once we support multiple 5380s (e.g. DuoDock) we'll do something different here */ instance = scsi_register (tpnt, sizeof(struct NCR5380_hostdata)); + if (instance == NULL) + return 0; if (macintosh_config->ident == MAC_MODEL_IIFX) { mac_scsi_regp = via1+0x8000; |
