]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'smsc47b397-new-id' into release
authorMark M. Hoffman <mhoffman@lightlink.com>
Thu, 1 May 2008 11:33:17 +0000 (07:33 -0400)
committerMark M. Hoffman <mhoffman@lightlink.com>
Thu, 1 May 2008 11:33:17 +0000 (07:33 -0400)
1  2 
drivers/hwmon/smsc47b397.c

index f61d8f4185b243efcf7bd3fb0f10fa6284dde6d2,54187bf25d34e695f8b82e6d5db388094e7ed440..eb03544c731ca47dd94c6d7d940b3f66a43dbcdd
@@@ -335,11 -331,23 +335,23 @@@ exit
  static int __init smsc47b397_find(unsigned short *addr)
  {
        u8 id, rev;
+       char *name;
  
        superio_enter();
 -      id = superio_inb(SUPERIO_REG_DEVID);
 +      id = force_id ? force_id : superio_inb(SUPERIO_REG_DEVID);
  
-       if ((id != 0x6f) && (id != 0x81) && (id != 0x85)) {
+       switch(id) {
+       case 0x81:
+               name = "SCH5307-NS";
+               break;
+       case 0x6f:
+               name = "LPC47B397-NC";
+               break;
+       case 0x85:
+       case 0x8c:
+               name = "SCH5317";
+               break;
+       default:
                superio_exit();
                return -ENODEV;
        }