i2c-parport: Fix adapter list handling (56acc7a3) · Commits · 戴 / test

drivers/i2c/busses/i2c-parport.c

+14 −13

Original line number	Original line	Diff line number	Diff line
	/* ------------------------------------------------------------------------ *		/* ------------------------------------------------------------------------ *
	* i2c-parport.c I2C bus over parallel port *		* i2c-parport.c I2C bus over parallel port *
	* ------------------------------------------------------------------------ *		* ------------------------------------------------------------------------ *
	Copyright (C) 2003-2010 Jean Delvare <khali@linux-fr.org>		Copyright (C) 2003-2011 Jean Delvare <khali@linux-fr.org>

	Based on older i2c-philips-par.c driver		Based on older i2c-philips-par.c driver
	Copyright (C) 1995-2000 Simon G. Vogl		Copyright (C) 1995-2000 Simon G. Vogl
	@@ -33,6 +33,8 @@
	#include <linux/i2c-algo-bit.h>		#include <linux/i2c-algo-bit.h>
	#include <linux/i2c-smbus.h>		#include <linux/i2c-smbus.h>
	#include <linux/slab.h>		#include <linux/slab.h>
			#include <linux/list.h>
			#include <linux/mutex.h>
	#include "i2c-parport.h"		#include "i2c-parport.h"

	/* ----- Device list ------------------------------------------------------ */		/* ----- Device list ------------------------------------------------------ */
	@@ -43,10 +45,11 @@ struct i2c_par {
	struct i2c_algo_bit_data algo_data;		struct i2c_algo_bit_data algo_data;
	struct i2c_smbus_alert_setup alert_data;		struct i2c_smbus_alert_setup alert_data;
	struct i2c_client *ara;		struct i2c_client *ara;
	struct i2c_par *next;		struct list_head node;
	};		};

	static struct i2c_par *adapter_list;		static LIST_HEAD(adapter_list);
			static DEFINE_MUTEX(adapter_list_lock);

	/* ----- Low-level parallel port access ----------------------------------- */		/* ----- Low-level parallel port access ----------------------------------- */

	@@ -228,8 +231,9 @@ static void i2c_parport_attach (struct parport *port)
	}		}

	/* Add the new adapter to the list */		/* Add the new adapter to the list */
	adapter->next = adapter_list;		mutex_lock(&adapter_list_lock);
	adapter_list = adapter;		list_add_tail(&adapter->node, &adapter_list);
			mutex_unlock(&adapter_list_lock);
	return;		return;

	ERROR1:		ERROR1:
	@@ -241,11 +245,11 @@ ERROR0:

	static void i2c_parport_detach (struct parport *port)		static void i2c_parport_detach (struct parport *port)
	{		{
	struct i2c_par adapter, prev;		struct i2c_par adapter, _n;

	/* Walk the list */		/* Walk the list */
	for (prev = NULL, adapter = adapter_list; adapter;		mutex_lock(&adapter_list_lock);
	prev = adapter, adapter = adapter->next) {		list_for_each_entry_safe(adapter, _n, &adapter_list, node) {
	if (adapter->pdev->port == port) {		if (adapter->pdev->port == port) {
	if (adapter->ara) {		if (adapter->ara) {
	parport_disable_irq(port);		parport_disable_irq(port);
	@@ -259,14 +263,11 @@ static void i2c_parport_detach (struct parport *port)

	parport_release(adapter->pdev);		parport_release(adapter->pdev);
	parport_unregister_device(adapter->pdev);		parport_unregister_device(adapter->pdev);
	if (prev)		list_del(&adapter->node);
	prev->next = adapter->next;
	else
	adapter_list = adapter->next;
	kfree(adapter);		kfree(adapter);
	return;
	}		}
	}		}
			mutex_unlock(&adapter_list_lock);
	}		}

	static struct parport_driver i2c_parport_driver = {		static struct parport_driver i2c_parport_driver = {

Admin message