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

Commit 60cfff35 authored by Len Brown's avatar Len Brown
Browse files

Auto-update from upstream

parents 89ef1a21 212d6d22

arch/ppc/syslib/m8xx_setup.c

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5, 
	ppc_md.find_end_of_memory	= m8xx_find_end_of_memory;

	ppc_md.setup_io_mappings	= m8xx_map_io;



#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)

#if defined(CONFIG_BLK_DEV_MPC8xx_IDE)

	m8xx_ide_init();

#endif

}

drivers/hwmon/adm1026.c

+1 −1
Original line number Diff line number Diff line
@@ -1691,7 +1691,7 @@ int adm1026_detect(struct i2c_adapter *adapter, int address, 


	/* Error out and cleanup code */

exitfree:

	kfree(new_client);

	kfree(data);

exit:

	return err;

}

drivers/hwmon/adm1031.c

+1 −1
Original line number Diff line number Diff line
@@ -834,7 +834,7 @@ static int adm1031_detect(struct i2c_adapter *adapter, int address, int kind) 
	return 0;



exit_free:

	kfree(new_client);

	kfree(data);

exit:

	return err;

}

drivers/hwmon/adm9240.c

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ static int adm9240_detect(struct i2c_adapter *adapter, int address, int kind) 


	return 0;

exit_free:

	kfree(new_client);

	kfree(data);

exit:

	return err;

}

drivers/hwmon/fscpos.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static ssize_t set_temp_reset(struct i2c_client *client, struct fscpos_data 
				"experience to the module author.\n");



	/* Supported value: 2 (clears the status) */

	fscpos_write_value(client, FSCPOS_REG_TEMP_STATE[nr], 2);

	fscpos_write_value(client, FSCPOS_REG_TEMP_STATE[nr - 1], 2);

	return count;

}