The patch titled
input drivers: handle sysfs errors
has been removed from the -mm tree. Its filename was
input-drivers-handle-sysfs-errors.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: input drivers: 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/mouse/logips2pp.c | 5 +-
drivers/input/touchscreen/ads7846.c | 45 +++++++++++++++++---------
2 files changed, 33 insertions(+), 17 deletions(-)
diff -puN drivers/input/mouse/logips2pp.c~input-drivers-handle-sysfs-errors drivers/input/mouse/logips2pp.c
--- a/drivers/input/mouse/logips2pp.c~input-drivers-handle-sysfs-errors
+++ a/drivers/input/mouse/logips2pp.c
@@ -393,8 +393,9 @@ int ps2pp_init(struct psmouse *psmouse,
psmouse->set_resolution = ps2pp_set_resolution;
psmouse->disconnect = ps2pp_disconnect;
- device_create_file(&psmouse->ps2dev.serio->dev,
- &psmouse_attr_smartscroll.dattr);
+ if (device_create_file(&psmouse->ps2dev.serio->dev,
+ &psmouse_attr_smartscroll.dattr))
+ return -1;
}
}
diff -puN drivers/input/touchscreen/ads7846.c~input-drivers-handle-sysfs-errors drivers/input/touchscreen/ads7846.c
--- a/drivers/input/touchscreen/ads7846.c~input-drivers-handle-sysfs-errors
+++ a/drivers/input/touchscreen/ads7846.c
@@ -792,34 +792,49 @@ static int __devinit ads7846_probe(struc
* use the other sensors a bit differently too
*/
if (ts->model == 7846) {
- device_create_file(&spi->dev, &dev_attr_temp0);
- device_create_file(&spi->dev, &dev_attr_temp1);
+ err = device_create_file(&spi->dev, &dev_attr_temp0);
+ if (err)
+ goto err_irq;
+ err = device_create_file(&spi->dev, &dev_attr_temp1);
+ if (err)
+ goto err_temp0;
}
- if (ts->model != 7845)
- device_create_file(&spi->dev, &dev_attr_vbatt);
- device_create_file(&spi->dev, &dev_attr_vaux);
+ if (ts->model != 7845) {
+ err = device_create_file(&spi->dev, &dev_attr_vbatt);
+ if (err)
+ goto err_temp1;
+ }
+ err = device_create_file(&spi->dev, &dev_attr_vaux);
+ if (err) goto err_vbatt;
- device_create_file(&spi->dev, &dev_attr_pen_down);
+ err = device_create_file(&spi->dev, &dev_attr_pen_down);
+ if (err) goto err_vaux;
- device_create_file(&spi->dev, &dev_attr_disable);
+ err = device_create_file(&spi->dev, &dev_attr_disable);
+ if (err) goto err_pen;
err = input_register_device(input_dev);
if (err)
- goto err_remove_attr;
+ goto err_disable;
return 0;
- err_remove_attr:
+ err_disable:
device_remove_file(&spi->dev, &dev_attr_disable);
+ err_pen:
device_remove_file(&spi->dev, &dev_attr_pen_down);
- if (ts->model == 7846) {
- device_remove_file(&spi->dev, &dev_attr_temp1);
- device_remove_file(&spi->dev, &dev_attr_temp0);
- }
+ err_vaux:
+ device_remove_file(&spi->dev, &dev_attr_vaux);
+ err_vbatt:
if (ts->model != 7845)
device_remove_file(&spi->dev, &dev_attr_vbatt);
- device_remove_file(&spi->dev, &dev_attr_vaux);
-
+ err_temp1:
+ if (ts->model == 7846)
+ device_remove_file(&spi->dev, &dev_attr_temp1);
+ err_temp0:
+ if (ts->model == 7846)
+ device_remove_file(&spi->dev, &dev_attr_temp0);
+ err_irq:
free_irq(spi->irq, ts);
err_free_mem:
input_free_device(input_dev);
_
Patches currently in -mm which might be from jeff@xxxxxxxxxx are
origin.patch
ide-add-the-support-of-nvidia-pata-controllers-of-mcp67-to-amd74xxc.patch
git-acpi.patch
git-cpufreq.patch
git-input.patch
input-handle-sysfs-errors.patch
git-libata-all.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
