Skip to contentSkip to conversation

2.6.27-rc6 updates for s390

GIT PULL Martin Schwidefsky 1 participant 1 message Sep 18, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi Linus,

please pull from 'for-linus' branch of

	git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus

to receive the following bug fixes:

Cornelia Huck (1):
[S390] cio: Fix driver_data handling for ccwgroup devices.

Stefan Weinhuber (1):
[S390] cio: fix orb initialization in cio_start_key

 drivers/s390/cio/ccwgroup.c |    4 +++-
 drivers/s390/cio/cio.c      |    1 +
 2 files changed, 4 insertions(+), 1 deletions(-)
drivers/s390/cio/ccwgroup.c +3 -1
index e0ce65f..9a50f24 100644
@@ -113,7 +113,8 @@ ccwgroup_release (struct device *dev)
 
 	for (i = 0; i < gdev->count; i++) {
 		if (gdev->cdev[i]) {
-			dev_set_drvdata(&gdev->cdev[i]->dev, NULL);
+			if (dev_get_drvdata(&gdev->cdev[i]->dev) == gdev)
+				dev_set_drvdata(&gdev->cdev[i]->dev, NULL);
 			put_device(&gdev->cdev[i]->dev);
 		}
 	}
@@ -296,6 +297,7 @@ error:
 			if (dev_get_drvdata(&gdev->cdev[i]->dev) == gdev)
 				dev_set_drvdata(&gdev->cdev[i]->dev, NULL);
 			put_device(&gdev->cdev[i]->dev);
+			gdev->cdev[i] = NULL;
 		}
 	mutex_unlock(&gdev->reg_mutex);
 	put_device(&gdev->dev);
drivers/s390/cio/cio.c +1 -0
index 5954b90..326f4cc 100644
@@ -174,6 +174,7 @@ cio_start_key (struct subchannel *sch,	/* subchannel structure */
 	CIO_TRACE_EVENT(4, sch->dev.bus_id);
 
 	orb = &to_io_private(sch)->orb;
+	memset(orb, 0, sizeof(union orb));
 	/* sch is always under 2G. */
 	orb->cmd.intparm = (u32)(addr_t)sch;
 	orb->cmd.fmt = 1;