Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f02f822 authored by Mark M. Hoffman's avatar Mark M. Hoffman
Browse files

Merge branch 'smsc47b397-new-id' into release

parents 18524486 80930776

drivers/hwmon/smsc47b397.c

+14 −3
Original line number Diff line number Diff line
@@ -335,11 +335,23 @@ static int __init smsc47b397_device_add(unsigned short address) 
static int __init smsc47b397_find(unsigned short *addr)

{

	u8 id, rev;

	char *name;



	superio_enter();

	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;

	}
@@ -352,8 +364,7 @@ static int __init smsc47b397_find(unsigned short *addr) 


	printk(KERN_INFO DRVNAME ": found SMSC %s "

		"(base address 0x%04x, revision %u)\n",

		id == 0x81 ? "SCH5307-NS" : id == 0x85 ? "SCH5317" :

	       "LPC47B397-NC", *addr, rev);

		name, *addr, rev);



	superio_exit();

	return 0;