The patch titled
input: handle sysfs errors
has been removed from the -mm tree. Its filename was
input-handle-sysfs-errors.patch
This patch was dropped because it is obsolete
------------------------------------------------------
Subject: input: handle sysfs errors
From: Jeff Garzik <jeff@xxxxxxxxxx>
Signed-off-by: Jeff Garzik <jeff@xxxxxxxxxx>
Cc: Dmitry Torokhov <dtor@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/input/keyboard/atkbd.c | 9 ++++++---
drivers/input/mouse/psmouse-base.c | 11 +++++++++--
2 files changed, 15 insertions(+), 5 deletions(-)
diff -puN drivers/input/keyboard/atkbd.c~input-handle-sysfs-errors drivers/input/keyboard/atkbd.c
--- a/drivers/input/keyboard/atkbd.c~input-handle-sysfs-errors
+++ a/drivers/input/keyboard/atkbd.c
@@ -972,9 +972,8 @@ static int atkbd_connect(struct serio *s
if (atkbd->write) {
if (atkbd_probe(atkbd)) {
- serio_close(serio);
err = -ENODEV;
- goto fail;
+ goto fail_close;
}
atkbd->set = atkbd_select_set(atkbd, atkbd_set, atkbd_extra);
@@ -988,7 +987,9 @@ static int atkbd_connect(struct serio *s
atkbd_set_keycode_table(atkbd);
atkbd_set_device_attrs(atkbd);
- sysfs_create_group(&serio->dev.kobj, &atkbd_attribute_group);
+ err = sysfs_create_group(&serio->dev.kobj, &atkbd_attribute_group);
+ if (err < 0)
+ goto fail_close;
atkbd_enable(atkbd);
@@ -996,6 +997,8 @@ static int atkbd_connect(struct serio *s
return 0;
+ fail_close:
+ serio_close(serio);
fail: serio_set_drvdata(serio, NULL);
input_free_device(dev);
kfree(atkbd);
diff -puN drivers/input/mouse/psmouse-base.c~input-handle-sysfs-errors drivers/input/mouse/psmouse-base.c
--- a/drivers/input/mouse/psmouse-base.c~input-handle-sysfs-errors
+++ a/drivers/input/mouse/psmouse-base.c
@@ -1152,11 +1152,13 @@ static int psmouse_connect(struct serio
input_register_device(psmouse->dev);
+ retval = sysfs_create_group(&serio->dev.kobj, &psmouse_attribute_group);
+ if (retval)
+ goto err_out;
+
if (parent && parent->pt_activate)
parent->pt_activate(parent);
- sysfs_create_group(&serio->dev.kobj, &psmouse_attribute_group);
-
psmouse_activate(psmouse);
retval = 0;
@@ -1174,6 +1176,11 @@ out:
mutex_unlock(&psmouse_mutex);
return retval;
+err_out:
+ input_unregister_device(psmouse->dev);
+ psmouse_set_state(psmouse, PSMOUSE_IGNORE);
+ serio_close(serio);
+ goto out;
}
_
Patches currently in -mm which might be from jeff@xxxxxxxxxx are
origin.patch
git-acpi.patch
git-cpufreq.patch
git-input.patch
input-handle-sysfs-errors.patch
git-libata-all.patch
pdc202xx_old-fix-name-clashes-with-pa-risc.patch
via-pata-controller-xfer-fixes.patch
via-pata-controller-xfer-fixes-fix.patch
ahci-ati-sb600-sata-support-for-various-modes.patch
git-mtd.patch
git-netdev-all.patch
libphy-dont-do-that.patch
git-net-configh-got-removed.patch
update-smc91x-driver-with-arm-versatile-board-info.patch
8139too-force-media-setting-fix.patch
netxen-build-fix.patch
netxen-more-build-fixes.patch
drivers-cris-return-on-null-dev_alloc_skb.patch
tulip-fix-shutdown-dma-irq-race.patch
git-ioat.patch
r8169-driver-corega-support-patch.patch
serial-handle-pci_enable_device-failure-upon-resume.patch
git-pciseg.patch
pci-device-ensure-sysdata-initialised-v2.patch
mpt-fusion-handle-pci-layer-error-on-resume.patch
scsi-aha1740-handle-scsi-api-errors.patch
scsi-minor-bug-fixes-and-cleanups.patch
i2o-more-error-checking.patch
pnp-handle-sysfs-errors.patch
rtc-handle-sysfs-errors.patch
sound-oss-emu10k1-handle-userspace-copy-errors.patch
spi-improve-sysfs-compiler-complaint-handling.patch
remove-double-cast-to-same-type.patch
via82cxxx-handle-error-condition-properly.patch
atyfb-rivafb-minor-fixes.patch
md-conditionalize-some-code.patch
user-of-the-jiffies-rounding-patch-ata-subsystem.patch
git-gccbug.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
