diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-11-14 14:38:28 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-14 14:38:28 +0100 |
| commit | 0c3c35e148dbc03106038dd25816fb9f3a084d86 (patch) | |
| tree | 8b8cc6a027353a0f242f61362b35b0942da61b83 /drivers/net/tokenring/ibmtr.c | |
| parent | 50d40f187f9182ee8caa1b83f80a0e11e2226baa (diff) | |
| parent | 5e08fe570c2dbabb5015c37049eb9a451e55c890 (diff) | |
| download | talos-op-linux-0c3c35e148dbc03106038dd25816fb9f3a084d86.tar.gz talos-op-linux-0c3c35e148dbc03106038dd25816fb9f3a084d86.zip | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'drivers/net/tokenring/ibmtr.c')
| -rw-r--r-- | drivers/net/tokenring/ibmtr.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c index 525bbc5b9c9d..75fa32e34fd0 100644 --- a/drivers/net/tokenring/ibmtr.c +++ b/drivers/net/tokenring/ibmtr.c @@ -108,6 +108,7 @@ in the event that chatty debug messages are desired - jjs 12/30/98 */ #define IBMTR_DEBUG_MESSAGES 0 #include <linux/module.h> +#include <linux/sched.h> #ifdef PCMCIA /* required for ibmtr_cs.c to build */ #undef MODULE /* yes, really */ @@ -1143,9 +1144,16 @@ static void dir_open_adapter (struct net_device *dev) } else { char **prphase = printphase; char **prerror = printerror; + int pnr = err / 16 - 1; + int enr = err % 16 - 1; DPRINTK("TR Adapter misc open failure, error code = "); - printk("0x%x, Phase: %s, Error: %s\n", - err, prphase[err/16 -1], prerror[err%16 -1]); + if (pnr < 0 || pnr >= ARRAY_SIZE(printphase) || + enr < 0 || + enr >= ARRAY_SIZE(printerror)) + printk("0x%x, invalid Phase/Error.", err); + else + printk("0x%x, Phase: %s, Error: %s\n", err, + prphase[pnr], prerror[enr]); printk(" retrying after %ds delay...\n", TR_RETRY_INTERVAL/HZ); } |
