 @@ -350,26 +350,42 @@ xf86EloReadInput(InputInfoPtr	pInfo)
           continue;
       /*
        * Process only ELO_TOUCHs here.
        */
       if (priv->packet_buf[1] == ELO_TOUCH) {
           /*
            * First stick together the various pieces.
            */
           cur_x = WORD_ASSEMBLY(priv->packet_buf[3], priv->packet_buf[4]);
           cur_y = WORD_ASSEMBLY(priv->packet_buf[5], priv->packet_buf[6]);
           state = priv->packet_buf[2] & 0x07;
           DBG(5, ErrorF("ELO got: x(%d), y(%d), %s\n",
                       cur_x, cur_y,
                       (state == ELO_PRESS) ? "Press" :
 			((state == ELO_RELEASE) ? "Release" : "Stream")));
           if (priv->min_y > priv->max_y) {
             /* inverted y axis */
             cur_y = priv->max_y - cur_y + priv->min_y;
+          }
           if (priv->min_x > priv->max_x) {
             /* inverted x axis */
             cur_x = priv->max_x - cur_x + priv->min_x;
+          }
           /*
            * Send events.
+           *
            * We *must* generate a motion before a button change if pointer
            * location has changed as DIX assumes this. This is why we always
            * emit a motion, regardless of the kind of packet processed.
            */
           xf86PostMotionEvent(pInfo->dev, TRUE, 0, 2, cur_x, cur_y);
           /*
            * Emit a button press or release.
            */
           if (state == ELO_PRESS || state == ELO_RELEASE) {
 @@ -666,26 +682,27 @@ xf86EloPtrControl(DeviceIntPtr	dev,
  ***************************************************************************
  */
 static Bool
 xf86EloControl(DeviceIntPtr	dev,
 	       int		mode)
+{
   InputInfoPtr	pInfo = (InputInfoPtr) dev->public.devicePrivate;
   EloPrivatePtr		priv = (EloPrivatePtr)(pInfo->private);
   unsigned char		map[] = { 0, 1 };
   unsigned char		req[ELO_PACKET_SIZE];
   unsigned char		reply[ELO_PACKET_SIZE];
   Atom btn_label;
   Atom axis_labels[2] = { 0, 0 };
   int x0, x1, y0, y1;
   switch(mode) {
   case DEVICE_INIT:
+    {
       DBG(2, ErrorF("Elographics touchscreen init...\n"));
       if (priv->screen_no >= screenInfo.numScreens ||
 	  priv->screen_no < 0) {
 	priv->screen_no = 0;
+      }
       priv->screen_width = screenInfo.screens[priv->screen_no]->width;
       priv->screen_height = screenInfo.screens[priv->screen_no]->height;
 @@ -709,37 +726,47 @@ xf86EloControl(DeviceIntPtr	dev,
       /*
        * Device reports motions on 2 axes in absolute coordinates.
        * Axes min and max values are reported in raw coordinates.
        * Resolution is computed roughly by the difference between
        * max and min values scaled from the approximate size of the
        * screen to fit one meter.
        */
       if (InitValuatorClassDeviceStruct(dev, 2, axis_labels,
 					GetMotionHistorySize(), Absolute) == FALSE) {
 	ErrorF("Unable to allocate Elographics touchscreen ValuatorClassDeviceStruct\n");
 	return !Success;
+      }
       else {
 	/* Correct the coordinates for possibly inverted axis.
 	   Leave priv->variables untouched so we can check for
 	   inversion on incoming events.
 	 */
 	y0 = min(priv->min_y, priv->max_y);
 	y1 = max(priv->min_y, priv->max_y);
 	x0 = min(priv->min_x, priv->max_x);
 	x1 = max(priv->min_x, priv->max_x);
 	/* I will map coordinates myself */
 	InitValuatorAxisStruct(dev, 0,
 			       axis_labels[0],
-			       priv->min_x, priv->max_x,
+			       x0, x1,
 ,
 /* min_res */,
 /* max_res */,
 			       Absolute);
 	InitValuatorAxisStruct(dev, 1,
 			       axis_labels[1],
-			       priv->min_y, priv->max_y,
+			       y0, y1,
 ,
 /* min_res */,
 /* max_res */,
 			       Absolute);
+      }
       if (InitFocusClassDeviceStruct(dev) == FALSE) {
 	ErrorF("Unable to allocate Elographics touchscreen FocusClassDeviceStruct\n");
+      }
       /*
        * Allocate the motion events buffer.
        */
 @@ -838,26 +865,31 @@ xf86EloControl(DeviceIntPtr	dev,
      * Close the port and free all the resources.
      */
   case DEVICE_CLOSE:
     DBG(2, ErrorF("Elographics touchscreen close...\n"));
     dev->public.on = FALSE;
     if (pInfo->fd >= 0) {
 	xf86RemoveEnabledDevice(pInfo);
+    }
     SYSCALL(close(pInfo->fd));
     pInfo->fd = -1;
     DBG(2, ErrorF("Done\n"));
     return Success;
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) * 100 + GET_ABI_MINOR(ABI_XINPUT_VERSION) >= 1901
   case DEVICE_ABORT:
     return Success;
 #endif
   default:
       ErrorF("unsupported mode=%d\n", mode);
       return BadValue;
+  }
+}
 /*
  ***************************************************************************
+ *
  * xf86EloAllocate --
+ *
  ***************************************************************************
  */