From a34a716b40704e7d1a83b9c9dffa5fd533f595f8 Mon Sep 17 00:00:00 2001
From: Cornelia Huck <cornelia.huck@de.ibm.com>
Date: Sun, 4 Jun 2006 02:51:27 -0700
Subject: [PATCH] --- yaml --- r: 27098 b: refs/heads/master c:
 e0ec574987a3301f7767750bb6e8be47d6323bfa h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/s390/cio/device_fsm.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index da3d4c63f79a..282f3561cf85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f258910733a8dbde368acc2ede4b8184ff0e09a
+refs/heads/master: e0ec574987a3301f7767750bb6e8be47d6323bfa
diff --git a/trunk/drivers/s390/cio/device_fsm.c b/trunk/drivers/s390/cio/device_fsm.c
index 180b3bf8b90d..49ec562d7f60 100644
--- a/trunk/drivers/s390/cio/device_fsm.c
+++ b/trunk/drivers/s390/cio/device_fsm.c
@@ -749,7 +749,7 @@ ccw_device_irq(struct ccw_device *cdev, enum dev_event dev_event)
 			/* Unit check but no sense data. Need basic sense. */
 			if (ccw_device_do_sense(cdev, irb) != 0)
 				goto call_handler_unsol;
-			memcpy(irb, &cdev->private->irb, sizeof(struct irb));
+			memcpy(&cdev->private->irb, irb, sizeof(struct irb));
 			cdev->private->state = DEV_STATE_W4SENSE;
 			cdev->private->intparm = 0;
 			return;