cciss: fix regression that no device nodes are created if no logical drives are confi...

[linux-2.6] / drivers / firewire / fw-device.c

diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c
index 75365cd0008a3f0ee6d5b3e9752e4cc86ae9afcc..d9c8daf7ae7d798b29a728464e1365c2fbe10b22 100644 (file)
--- a/drivers/firewire/fw-device.c
+++ b/drivers/firewire/fw-device.c
@@ -26,7 +26,8 @@
 #include <linux/delay.h>
 #include <linux/idr.h>
 #include <linux/string.h>
-#include <asm/semaphore.h>
+#include <linux/rwsem.h>
+#include <linux/semaphore.h>
 #include <asm/system.h>
 #include <linux/ctype.h>
 #include "fw-transaction.h"
@@ -410,7 +411,7 @@ read_rom(struct fw_device *device, int generation, int index, u32 *data)
 
        init_completion(&callback_data.done);
 
-       offset = 0xfffff0000400ULL + index * 4;
+       offset = (CSR_REGISTER_BASE | CSR_CONFIG_ROM) + index * 4;
        fw_send_request(device->card, &t, TCODE_READ_QUADLET_REQUEST,
                        device->node_id, generation, device->max_speed,
                        offset, NULL, 4, complete_transaction, &callback_data);