diff options
| author | scottl <scottl@FreeBSD.org> | 2004-05-04 03:16:22 +0000 |
|---|---|---|
| committer | scottl <scottl@FreeBSD.org> | 2004-05-04 03:16:22 +0000 |
| commit | 7e5c8753a4a3c71eda2c2935a64274dc27ed7c45 (patch) | |
| tree | 09e23d83475b7bb2b136bbbea001e06597f6314e /sys/dev/asr/asr.c | |
| parent | 4bc7b15849ebe59c7b287e4190b1f6452e1472b5 (diff) | |
| download | FreeBSD-src-7e5c8753a4a3c71eda2c2935a64274dc27ed7c45.zip FreeBSD-src-7e5c8753a4a3c71eda2c2935a64274dc27ed7c45.tar.gz | |
Fix a typo from rev 1.56 that somehow escaped my testing.
Diffstat (limited to 'sys/dev/asr/asr.c')
| -rw-r--r-- | sys/dev/asr/asr.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/asr/asr.c b/sys/dev/asr/asr.c index 6b7edef..c8bbc13 100644 --- a/sys/dev/asr/asr.c +++ b/sys/dev/asr/asr.c @@ -431,6 +431,7 @@ ASR_fillMessage(void *Message, u_int16_t size) I2O_MESSAGE_FRAME_setMessageSize(Message_Ptr, (size + sizeof(U32) - 1) >> 2); I2O_MESSAGE_FRAME_setInitiatorAddress (Message_Ptr, 1); + KASSERT(Message_Ptr != NULL, ("Message_Ptr == NULL")); return (Message_Ptr); } /* ASR_fillMessage */ @@ -1396,21 +1397,20 @@ ASR_acquireLct(Asr_softc_t *sc) /* * sc value assumed valid */ - MessageSizeInBytes = sizeof(I2O_EXEC_LCT_NOTIFY_MESSAGE) - - sizeof(I2O_SG_ELEMENT) + sizeof(I2O_SGE_SIMPLE_ELEMENT); - if ((Message_Ptr = (PI2O_EXEC_LCT_NOTIFY_MESSAGE)malloc ( - MessageSizeInBytes, M_TEMP, M_WAITOK)) == NULL) { + MessageSizeInBytes = sizeof(I2O_EXEC_LCT_NOTIFY_MESSAGE) - + sizeof(I2O_SG_ELEMENT) + sizeof(I2O_SGE_SIMPLE_ELEMENT); + if ((Message_Ptr = (PI2O_EXEC_LCT_NOTIFY_MESSAGE)malloc( + MessageSizeInBytes, M_TEMP, M_WAITOK)) == NULL) { return (ENOMEM); } (void)ASR_fillMessage((void *)Message_Ptr, MessageSizeInBytes); I2O_MESSAGE_FRAME_setVersionOffset(&(Message_Ptr->StdMessageFrame), - (I2O_VERSION_11 + - (((sizeof(I2O_EXEC_LCT_NOTIFY_MESSAGE) - sizeof(I2O_SG_ELEMENT)) - / sizeof(U32)) << 4))); + (I2O_VERSION_11 + (((sizeof(I2O_EXEC_LCT_NOTIFY_MESSAGE) - + sizeof(I2O_SG_ELEMENT)) / sizeof(U32)) << 4))); I2O_MESSAGE_FRAME_setFunction(&(Message_Ptr->StdMessageFrame), - I2O_EXEC_LCT_NOTIFY); + I2O_EXEC_LCT_NOTIFY); I2O_EXEC_LCT_NOTIFY_MESSAGE_setClassIdentifier(Message_Ptr, - I2O_CLASS_MATCH_ANYCLASS); + I2O_CLASS_MATCH_ANYCLASS); /* * Call the LCT table to determine the number of device entries * to reserve space for. @@ -1887,7 +1887,7 @@ ASR_setSysTab(Asr_softc_t *sc) free(SystemTable, M_TEMP); return (ENOMEM); } - (void)ASR_fillMessage((void *)&Message_Ptr, + (void)ASR_fillMessage((void *)Message_Ptr, sizeof(I2O_EXEC_SYS_TAB_SET_MESSAGE) - sizeof(I2O_SG_ELEMENT) + ((3+SystemTable->NumberEntries) * sizeof(I2O_SGE_SIMPLE_ELEMENT))); I2O_MESSAGE_FRAME_setVersionOffset(&(Message_Ptr->StdMessageFrame), |
