VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / s390 / cio / cio.c

diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index a16f061..38e59dd 100644 (file)
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -688,15 +688,15 @@ cio_console_irq(void)
                if (stsch(console_irq, &console_subchannel.schib) != 0 ||
                    !console_subchannel.schib.pmcw.dnv)
                        return -1;
-               console_device = console_subchannel.schib.pmcw.dev;
-       } else if (console_device != -1) {
+               console_devno = console_subchannel.schib.pmcw.dev;
+       } else if (console_devno != -1) {
                /* At least the console device number is known. */
                for (irq = 0; irq < __MAX_SUBCHANNELS; irq++) {
                        if (stsch(irq, &console_subchannel.schib) != 0)
                                break;
                        if (console_subchannel.schib.pmcw.dnv &&
                            console_subchannel.schib.pmcw.dev ==
-                           console_device) {
+                           console_devno) {
                                console_irq = irq;
                                break;
                        }