From e62e5fc51623141f728b3117d7079affdc357fb8 Mon Sep 17 00:00:00 2001 From: Sebastian Ott Date: Thu, 1 Dec 2011 13:32:22 +0100 Subject: [PATCH] --- yaml --- r: 276359 b: refs/heads/master c: 3b484ec648490518dd16ed7d8f02206a39539a59 h: refs/heads/master i: 276357: 3038a4198c510549113e65695cd94e1edb122b59 276355: ed1f589eb3e0f6d7ca65dc68d253611431b109a4 276351: 95f01ca704fa6d750e105340195aa0fc79084027 v: v3 --- [refs] | 2 +- trunk/drivers/s390/cio/chsc.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0ba51f42f91a..25cf32a38d4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50c8e31f38f380f04885c66bde0bc4c946e786ee +refs/heads/master: 3b484ec648490518dd16ed7d8f02206a39539a59 diff --git a/trunk/drivers/s390/cio/chsc.c b/trunk/drivers/s390/cio/chsc.c index 75c3f1f8fd43..a84631a7391d 100644 --- a/trunk/drivers/s390/cio/chsc.c +++ b/trunk/drivers/s390/cio/chsc.c @@ -529,10 +529,7 @@ __s390_vary_chpid_on(struct subchannel_id schid, void *data) int chsc_chp_vary(struct chp_id chpid, int on) { struct channel_path *chp = chpid_to_chp(chpid); - struct chp_link link; - memset(&link, 0, sizeof(struct chp_link)); - link.chpid = chpid; /* Wait until previous actions have settled. */ css_wait_for_slow_path(); /* @@ -542,10 +539,10 @@ int chsc_chp_vary(struct chp_id chpid, int on) /* Try to update the channel path descritor. */ chsc_determine_base_channel_path_desc(chpid, &chp->desc); for_each_subchannel_staged(s390_subchannel_vary_chpid_on, - __s390_vary_chpid_on, &link); + __s390_vary_chpid_on, &chpid); } else for_each_subchannel_staged(s390_subchannel_vary_chpid_off, - NULL, &link); + NULL, &chpid); return 0; }