2.6.6-lirc_i2c.diff

   1 diff -urN linux-2.6.6.orig/drivers/char/lirc/lirc_i2c.c linux-2.6.6/drivers/char/lirc/lirc_i2c.c
   2 --- linux-2.6.6.orig/drivers/char/lirc/lirc_i2c.c       2004-05-12 16:42:35.000000000 +0000
   3 +++ linux-2.6.6/drivers/char/lirc/lirc_i2c.c    2004-05-13 09:11:21.000000000 +0000
   4 @@ -1,4 +1,4 @@
   5 -/*      $Id$      */
   6 +/*      $Id$      */
   7
   8  /*
   9   * i2c IR lirc plugin for Hauppauge and Pixelview cards - new 2.8.x i2c stack
  10 @@ -134,7 +134,7 @@
  11
  12         if (rc == -1) {
  13                 /* should this return -EIO? */
  14 -               dprintk(DEVICE_NAME ": %s read error\n", ir->c.name);
  15 +               dprintk(DEVICE_NAME ": %s read error\n", ir->client.name);
  16                 return -ENODATA;
  17         }
  18
  19 @@ -167,7 +167,7 @@
  20         unsigned char codes[2];
  21
  22         /* poll IR chip */
  23 -       if (3 == i2c_master_recv(&ir->c,keybuf,3)) {
  24 +       if (3 == i2c_master_recv(&ir->client,keybuf,3)) {
  25                 ir->b[0] = keybuf[0];
  26                 ir->b[1] = keybuf[1];
  27                 ir->b[2] = keybuf[2];
  28 @@ -200,7 +200,7 @@
  29         unsigned char key;
  30
  31         /* poll IR chip */
  32 -       if (1 != i2c_master_recv(&ir->c,&key,1)) {
  33 +       if (1 != i2c_master_recv(&ir->client,&key,1)) {
  34                 dprintk(DRIVER_NAME ": read error\n");
  35                 return -1;
  36         }
  37 @@ -209,7 +209,9 @@
  38
  39         /* return it */
  40         lirc_buffer_write_1( buf, &key );
  41 -       *key = b;
  42 +/* not sure where b came from
  43 +       *key = b;
  44 +*/
  45         return 0;
  46  }
  47
  48 @@ -220,7 +222,7 @@
  49         unsigned char codes[4];
  50
  51         /* poll IR chip */
  52 -       if (1 != i2c_master_recv(&ir->c,&key,1)) {
  53 +       if (1 != i2c_master_recv(&ir->client,&key,1)) {
  54                 dprintk(DRIVER_NAME ": read error\n");
  55                 return -ENODATA;
  56         }
  57 @@ -245,7 +247,7 @@
  58         unsigned char key;
  59
  60         /* poll IR chip */
  61 -       if (1 != i2c_master_recv(&ir->c,&key,1)) {
  62 +       if (1 != i2c_master_recv(&ir->client,&key,1)) {
  63                 dprintk(DRIVER_NAME ": read error\n");
  64                 return -ENODATA;
  65         }