Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linux-2.6] / drivers / ieee1394 / sbp2.c

diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index fe3e1703fa618d99a446654edd7307c90f8a2be8..de88218ef7cce8c8eb4912aedb4bdffbd64f7561 100644 (file)
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -169,6 +169,7 @@ MODULE_DEVICE_TABLE(ieee1394, sbp2_id_table);
  * Debug levels, configured via kernel config, or enable here.
  */
 
+#define CONFIG_IEEE1394_SBP2_DEBUG 0
 /* #define CONFIG_IEEE1394_SBP2_DEBUG_ORBS */
 /* #define CONFIG_IEEE1394_SBP2_DEBUG_DMA */
 /* #define CONFIG_IEEE1394_SBP2_DEBUG 1 */
@@ -789,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");
 
@@ -938,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;