diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:43:54 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:43:54 -0400 |
| commit | b160292cc216a50fd0cd386b0bda2cd48352c73b (patch) | |
| tree | ef07cf98f91353ee4c9ec1e1ca7a2a5d9d4b538a /drivers/s390/net/qeth_sys.c | |
| parent | b37bde147890c8fea8369a5a4e230dabdea4ebfb (diff) | |
| parent | bbf25010f1a6b761914430f5fca081ec8c7accd1 (diff) | |
Merge Linux 2.6.23
Diffstat (limited to 'drivers/s390/net/qeth_sys.c')
| -rw-r--r-- | drivers/s390/net/qeth_sys.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/s390/net/qeth_sys.c b/drivers/s390/net/qeth_sys.c index bb0287ad1aac..2cc3f3a0e393 100644 --- a/drivers/s390/net/qeth_sys.c +++ b/drivers/s390/net/qeth_sys.c | |||
| @@ -1760,10 +1760,10 @@ qeth_remove_device_attributes(struct device *dev) | |||
| 1760 | { | 1760 | { |
| 1761 | struct qeth_card *card = dev->driver_data; | 1761 | struct qeth_card *card = dev->driver_data; |
| 1762 | 1762 | ||
| 1763 | if (card->info.type == QETH_CARD_TYPE_OSN) | 1763 | if (card->info.type == QETH_CARD_TYPE_OSN) { |
| 1764 | return sysfs_remove_group(&dev->kobj, | 1764 | sysfs_remove_group(&dev->kobj, &qeth_osn_device_attr_group); |
| 1765 | &qeth_osn_device_attr_group); | 1765 | return; |
| 1766 | 1766 | } | |
| 1767 | sysfs_remove_group(&dev->kobj, &qeth_device_attr_group); | 1767 | sysfs_remove_group(&dev->kobj, &qeth_device_attr_group); |
| 1768 | sysfs_remove_group(&dev->kobj, &qeth_device_ipato_group); | 1768 | sysfs_remove_group(&dev->kobj, &qeth_device_ipato_group); |
| 1769 | sysfs_remove_group(&dev->kobj, &qeth_device_vipa_group); | 1769 | sysfs_remove_group(&dev->kobj, &qeth_device_vipa_group); |