tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] cio: fix orb initialization in cio_start_key
[S390] cio: Fix driver_data handling for ccwgroup devices.

Linus Torvalds 9824b8f1 ab048fb1

+4 -1
+3 -1
drivers/s390/cio/ccwgroup.c
··· 113 113 114 114 for (i = 0; i < gdev->count; i++) { 115 115 if (gdev->cdev[i]) { 116 - dev_set_drvdata(&gdev->cdev[i]->dev, NULL); 116 + if (dev_get_drvdata(&gdev->cdev[i]->dev) == gdev) 117 + dev_set_drvdata(&gdev->cdev[i]->dev, NULL); 117 118 put_device(&gdev->cdev[i]->dev); 118 119 } 119 120 } ··· 297 296 if (dev_get_drvdata(&gdev->cdev[i]->dev) == gdev) 298 297 dev_set_drvdata(&gdev->cdev[i]->dev, NULL); 299 298 put_device(&gdev->cdev[i]->dev); 299 + gdev->cdev[i] = NULL; 300 300 } 301 301 mutex_unlock(&gdev->reg_mutex); 302 302 put_device(&gdev->dev);
+1
drivers/s390/cio/cio.c
··· 174 174 CIO_TRACE_EVENT(4, sch->dev.bus_id); 175 175 176 176 orb = &to_io_private(sch)->orb; 177 + memset(orb, 0, sizeof(union orb)); 177 178 /* sch is always under 2G. */ 178 179 orb->cmd.intparm = (u32)(addr_t)sch; 179 180 orb->cmd.fmt = 1;