The patch titled
i2c-add-support-for-virtual-i2c-adapters-tidy
has been added to the -mm tree. Its filename is
i2c-add-support-for-virtual-i2c-adapters-tidy.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Andrew Morton <akpm@xxxxxxxx>
Please don't do that.
Cc: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Cc: Jean Delvare <khali@xxxxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/i2c/i2c-virt.c | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff -puN drivers/i2c/i2c-virt.c~i2c-add-support-for-virtual-i2c-adapters-tidy drivers/i2c/i2c-virt.c
--- devel/drivers/i2c/i2c-virt.c~i2c-add-support-for-virtual-i2c-adapters-tidy 2006-04-16 17:23:38.000000000 -0700
+++ devel-akpm/drivers/i2c/i2c-virt.c 2006-04-16 17:23:38.000000000 -0700
@@ -51,9 +51,9 @@ i2c_virt_master_xfer(struct i2c_adapter
*/
mutex_lock(&parent->bus_lock);
- if ((ret = priv->select(parent, priv->client, priv->id)) >= 0) {
+ ret = priv->select(parent, priv->client, priv->id);
+ if (ret >= 0)
ret = parent->algo->master_xfer(parent, msgs, num);
- }
priv->deselect(parent, priv->client, priv->id);
mutex_unlock(&parent->bus_lock);
@@ -75,10 +75,10 @@ i2c_virt_smbus_xfer(struct i2c_adapter *
*/
mutex_lock(&parent->bus_lock);
- if ((ret = priv->select(parent, priv->client, priv->id)) == 0) {
+ ret = priv->select(parent, priv->client, priv->id);
+ if (ret == 0)
ret = parent->algo->smbus_xfer(parent, addr, flags,
read_write, command, size, data);
- }
priv->deselect(parent, priv->client, priv->id);
mutex_unlock(&parent->bus_lock);
@@ -106,9 +106,9 @@ i2c_add_virt_adapter(struct i2c_adapter
struct i2c_virt_priv *priv;
struct i2c_algorithm *algo;
- if (!(adap = kzalloc(sizeof(struct i2c_adapter)
- + sizeof(struct i2c_virt_priv)
- + sizeof(struct i2c_algorithm), GFP_KERNEL)))
+ adap = kzalloc(sizeof(struct i2c_adapter) + sizeof(struct i2c_virt_priv)
+ + sizeof(struct i2c_algorithm), GFP_KERNEL);
+ if (!adap)
return NULL;
priv = (struct i2c_virt_priv *)(adap + 1);
@@ -158,7 +158,8 @@ int i2c_del_virt_adapter(struct i2c_adap
{
int ret;
- if ((ret = i2c_del_adapter_nolock(adap)) < 0)
+ ret = i2c_del_adapter_nolock(adap);
+ if (ret < 0)
return ret;
kfree(adap);
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
config_net=n-build-fix.patch
git-acpi.patch
acpi-update-asus_acpi-driver-registration-fix.patch
acpi-memory-hotplug-cannot-manage-_crs-with-plural-resoureces.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driver-register-start-func-for-memory-device.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driveravoid-redundant-call-add_memory.patch
sony_apci-resume.patch
git-audit-master-fixup.patch
powernow-k8-crash-workaround.patch
git-drm.patch
git-dvb.patch
git-dvb-compat-build-fix.patch
bt866-build-fix.patch
connector-exports.patch
i2c-add-support-for-virtual-i2c-adapters-tidy.patch
git-libata-all.patch
mtd-improve-parameter-parsing-for-block2mtd-fix.patch
pci-error-recovery-e1000-network-device-driver.patch
git-pcmcia.patch
revert-pci-pci-cardbus-cards-hidden-needs-pci=assign-busses-to-fix.patch
scsi_scan-warning-fix.patch
megaraid-unused-variable.patch
git-splice-fixup.patch
git-watchdog.patch
arm-add_memory-build-fix.patch
pg_uncached-is-ia64-only.patch
migration-remove-unnecessary-pageswapcache-checks-fix.patch
wait_table-and-zonelist-initializing-for-memory-hotadd-wait_table-initialization-fixes.patch
preserve-write-permissions-in-migration-entries-fix.patch
oom-kill-mm-locking-fix.patch
page_allocc-buddy-handling-cleanup.patch
slab-cleanup-kmem_getpages-fix.patch
slab-stop-using-list_for_each-fix.patch
acx1xx-wireless-driver.patch
prune_one_dentry-tweaks.patch
fix-cdrom-being-confused-on-using-kdump-tweaks.patch
mmput-might-sleep.patch
tpm-use-clear_bit-fix.patch
tpm-use-clear_bit-fix-fix.patch
tpm-use-clear_bit-fix-fix-fix-fix.patch
hangcheck-remove-monotomic_clock-on-x86.patch
pi-futex-futex-code-cleanups-fix.patch
reiser4.patch
kgdb-core-lite-add-reboot-command.patch
kgdb-8250-fix.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
revert-tty-buffering-comment-out-debug-code.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
