X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=include%2Flinux%2Fipmi_smi.h;h=6e8cec50338000c31748bd1a8e5d4b28e26820cf;hb=bb7de070d2cf11f92341c40cd1810e8eebfbcbf8;hp=efa292a52e7e56ad8c315c3824c87fa98dc50cfa;hpb=4800be295c34268fd3211d49828bfaa6bf62867f;p=linux-2.6 diff --git a/include/linux/ipmi_smi.h b/include/linux/ipmi_smi.h index efa292a52e..6e8cec5033 100644 --- a/include/linux/ipmi_smi.h +++ b/include/linux/ipmi_smi.h @@ -118,7 +118,7 @@ struct ipmi_smi_handlers /* Enable/disable firmware maintenance mode. Note that this is *not* the modes defined, this is simply an on/off setting. The message handler does the mode handling. Note - that this is called from interupt context, so it cannot + that this is called from interrupt context, so it cannot block. */ void (*set_maintenance_mode)(void *send_info, int enable); @@ -173,7 +173,7 @@ static inline int ipmi_demangle_device_id(const unsigned char *data, id->firmware_revision_2 = data[3]; id->ipmi_version = data[4]; id->additional_device_support = data[5]; - if (data_len >= 6) { + if (data_len >= 11) { id->manufacturer_id = (data[6] | (data[7] << 8) | (data[8] << 16)); id->product_id = data[9] | (data[10] << 8);