From 3401e2c465c99295ea7cc6a50c0535a3a97e0bc4 Mon Sep 17 00:00:00 2001
From: Jens Taprogge <jens.taprogge@taprogge.org>
Date: Tue, 11 Sep 2012 13:35:02 +0200
Subject: [PATCH] --- yaml --- r: 325170 b: refs/heads/master c:
 8a3ae16e60fb78e0bf062c243ffba5575b64a412 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/staging/ipack/ipack.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f1e09a944e1f..b16ed2961f33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07766ab0256c0870746dae2362625e64e8968fc7
+refs/heads/master: 8a3ae16e60fb78e0bf062c243ffba5575b64a412
diff --git a/trunk/drivers/staging/ipack/ipack.c b/trunk/drivers/staging/ipack/ipack.c
index e2f819ca49c6..08b122dfee7c 100644
--- a/trunk/drivers/staging/ipack/ipack.c
+++ b/trunk/drivers/staging/ipack/ipack.c
@@ -379,6 +379,8 @@ struct ipack_device *ipack_device_register(struct ipack_bus_device *bus,
 
 	if (bus->ops->set_clockrate(dev, 8))
 		dev_warn(&dev->dev, "failed to switch to 8 MHz operation for reading of device ID.\n");
+	if (bus->ops->reset_timeout(dev))
+		dev_warn(&dev->dev, "failed to reset potential timeout.");
 
 	ret = ipack_device_read_id(dev);
 	if (ret < 0) {