diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-01 08:28:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-01 08:28:15 -0700 |
| commit | f285e3d329ce68cc355fadf4ab2c8f34d7f264cb (patch) | |
| tree | a40ae43a277bedeec732fd20eee166990974fb58 /drivers/firewire/fw-card.c | |
| parent | c1a834dc704763673df10282995257f2de93cbe9 (diff) | |
| parent | ca9a7af35f1ce4a990c6c3aace65ed36f89d50bf (diff) | |
| download | linux-f285e3d329ce68cc355fadf4ab2c8f34d7f264cb.tar.gz linux-f285e3d329ce68cc355fadf4ab2c8f34d7f264cb.tar.bz2 linux-f285e3d329ce68cc355fadf4ab2c8f34d7f264cb.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: Install firewire-constants.h and firewire-cdev.h for userspace.
firewire: Change struct fw_cdev_iso_packet to not use bitfields.
firewire: Implement suspend/resume PCI driver hooks.
firewire: add to MAINTAINERS
firewire: fw-sbp2: implement sysfs ieee1394_id
ieee1394: sbp2: offer SAM-conforming target port ID in sysfs
ieee1394: fix calculation of sysfs attribute "address"
Diffstat (limited to 'drivers/firewire/fw-card.c')
| -rw-r--r-- | drivers/firewire/fw-card.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c index 636151a64add..9eb1edacd825 100644 --- a/drivers/firewire/fw-card.c +++ b/drivers/firewire/fw-card.c @@ -407,11 +407,6 @@ fw_card_add(struct fw_card *card, card->link_speed = link_speed; card->guid = guid; - /* Activate link_on bit and contender bit in our self ID packets.*/ - if (card->driver->update_phy_reg(card, 4, 0, - PHY_LINK_ACTIVE | PHY_CONTENDER) < 0) - return -EIO; - /* * The subsystem grabs a reference when the card is added and * drops it when the driver calls fw_core_remove_card. |