diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-09-25 05:14:45 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-09-25 05:14:45 +0200 |
| commit | 4e0c1159d83a658d1ffba5bc3442f4ec4cadb436 (patch) | |
| tree | 36a5079ba7ba9b9e0f2f633356705b980940eac4 /drivers/ieee1394 | |
| parent | drm: add radeon PCI express support (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-ucb (diff) | |
| download | linux-4e0c1159d83a658d1ffba5bc3442f4ec4cadb436.tar.xz linux-4e0c1159d83a658d1ffba5bc3442f4ec4cadb436.zip | |
update from upstream
Diffstat (limited to 'drivers/ieee1394')
| -rw-r--r-- | drivers/ieee1394/nodemgr.c | 8 | ||||
| -rw-r--r-- | drivers/ieee1394/pcilynx.c | 20 | ||||
| -rw-r--r-- | drivers/ieee1394/sbp2.c | 8 | ||||
| -rw-r--r-- | drivers/ieee1394/video1394.c | 2 |
4 files changed, 13 insertions, 25 deletions
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index bebcc47ab06c..b23322523ef5 100644 --- a/drivers/ieee1394/nodemgr.c +++ b/drivers/ieee1394/nodemgr.c @@ -1068,6 +1068,8 @@ static int nodemgr_hotplug(struct class_device *cdev, char **envp, int num_envp, struct unit_directory *ud; int i = 0; int length = 0; + /* ieee1394:venNmoNspNverN */ + char buf[8 + 1 + 3 + 8 + 2 + 8 + 2 + 8 + 3 + 8 + 1]; if (!cdev) return -ENODEV; @@ -1094,6 +1096,12 @@ do { \ PUT_ENVP("GUID=%016Lx", (unsigned long long)ud->ne->guid); PUT_ENVP("SPECIFIER_ID=%06x", ud->specifier_id); PUT_ENVP("VERSION=%06x", ud->version); + snprintf(buf, sizeof(buf), "ieee1394:ven%08Xmo%08Xsp%08Xver%08X", + ud->vendor_id, + ud->model_id, + ud->specifier_id, + ud->version); + PUT_ENVP("MODALIAS=%s", buf); #undef PUT_ENVP diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c index 36074e6eeebb..6b1ab875333b 100644 --- a/drivers/ieee1394/pcilynx.c +++ b/drivers/ieee1394/pcilynx.c @@ -1464,26 +1464,6 @@ static int __devinit add_card(struct pci_dev *dev, { 0x50, I2C_M_RD, 20, (unsigned char*) lynx->bus_info_block } }; - -#ifdef CONFIG_IEEE1394_VERBOSEDEBUG - union i2c_smbus_data data; - - if (i2c_smbus_xfer(i2c_ad, 80, 0, I2C_SMBUS_WRITE, 0, I2C_SMBUS_BYTE,NULL)) - PRINT(KERN_ERR, lynx->id,"eeprom read start has failed"); - else - { - u16 addr; - for (addr=0x00; addr < 0x100; addr++) { - if (i2c_smbus_xfer(i2c_ad, 80, 0, I2C_SMBUS_READ, 0, I2C_SMBUS_BYTE,& data)) { - PRINT(KERN_ERR, lynx->id, "unable to read i2c %x", addr); - break; - } - else - PRINT(KERN_DEBUG, lynx->id,"got serial eeprom data at %x: %x",addr, data.byte); - } - } -#endif - /* we use i2c_transfer, because i2c_smbus_read_block_data does not work properly and we do it more efficiently in one transaction rather then using several reads */ if (i2c_transfer(i2c_ad, msg, 2) < 0) { diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index 627af507643a..de88218ef7cc 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c @@ -790,7 +790,7 @@ static void sbp2_host_reset(struct hpsb_host *host) static int sbp2_start_device(struct scsi_id_instance_data *scsi_id) { struct sbp2scsi_host_info *hi = scsi_id->hi; - struct scsi_device *sdev; + int error; SBP2_DEBUG("sbp2_start_device"); @@ -939,10 +939,10 @@ alloc_fail: sbp2_max_speed_and_size(scsi_id); /* Add this device to the scsi layer now */ - sdev = scsi_add_device(scsi_id->scsi_host, 0, scsi_id->ud->id, 0); - if (IS_ERR(sdev)) { + error = scsi_add_device(scsi_id->scsi_host, 0, scsi_id->ud->id, 0); + if (error) { SBP2_ERR("scsi_add_device failed"); - return PTR_ERR(sdev); + return error; } return 0; diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c index 06759b36afea..9d6facf2f78f 100644 --- a/drivers/ieee1394/video1394.c +++ b/drivers/ieee1394/video1394.c @@ -883,7 +883,7 @@ static int __video1394_ioctl(struct file *file, v.channel); } - if (copy_to_user((void *)arg, &v, sizeof(v))) { + if (copy_to_user(argp, &v, sizeof(v))) { /* FIXME : free allocated dma resources */ return -EFAULT; } |