aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/net
diff options
context:
space:
mode:
authorUrsula Braun <ursula.braun@de.ibm.com>2009-05-19 17:38:38 -0400
committerDavid S. Miller <davem@davemloft.net>2009-05-20 20:36:49 -0400
commit8ac6d452281b01b9c7ff382d640b547379e398cd (patch)
treec8abfc7a79850d38a070b93b60b8346afb97af70 /drivers/s390/net
parentf214856540f6d704e817bf6b26a6bca9e697ee72 (diff)
ctcm: avoid crash in ctcm_remove_device
Channels are already removed when setting a ctcm-device offline. Thus ctcm_remove_device must not refer to channel information. Solution: delete channel information from the trace call in ctcm_remove_device. Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com> Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net')
-rw-r--r--drivers/s390/net/ctcm_main.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index 77f4033a0f4f..54c4649a493b 100644
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -1677,10 +1677,8 @@ static void ctcm_remove_device(struct ccwgroup_device *cgdev)
1677 BUG_ON(priv == NULL); 1677 BUG_ON(priv == NULL);
1678 1678
1679 CTCM_DBF_TEXT_(SETUP, CTC_DBF_INFO, 1679 CTCM_DBF_TEXT_(SETUP, CTC_DBF_INFO,
1680 "removing device %s, r/w = %s/%s, proto : %d", 1680 "removing device %p, proto : %d",
1681 priv->channel[READ]->netdev->name, 1681 cgdev, priv->protocol);
1682 priv->channel[READ]->id, priv->channel[WRITE]->id,
1683 priv->protocol);
1684 1682
1685 if (cgdev->state == CCWGROUP_ONLINE) 1683 if (cgdev->state == CCWGROUP_ONLINE)
1686 ctcm_shutdown_device(cgdev); 1684 ctcm_shutdown_device(cgdev);