Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / ieee1394 / raw1394.c

diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
index 336e5ff4cfcf6f111cf5c57d6a043c5767d1513d..04e96ba56e090af3cd4ff6ab44e5b1fb147d2fd1 100644 (file)
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
@@ -858,7 +858,7 @@ static int arm_read(struct hpsb_host *host, int nodeid, quadlet_t * buffer,
        int found = 0, size = 0, rcode = -1;
        struct arm_request_response *arm_req_resp = NULL;
 
-       DBGMSG("arm_read  called by node: %X"
+       DBGMSG("arm_read  called by node: %X "
               "addr: %4.4x %8.8x length: %Zu", nodeid,
               (u16) ((addr >> 32) & 0xFFFF), (u32) (addr & 0xFFFFFFFF),
               length);
@@ -1012,7 +1012,7 @@ static int arm_write(struct hpsb_host *host, int nodeid, int destid,
        int found = 0, size = 0, rcode = -1, length_conflict = 0;
        struct arm_request_response *arm_req_resp = NULL;
 
-       DBGMSG("arm_write called by node: %X"
+       DBGMSG("arm_write called by node: %X "
               "addr: %4.4x %8.8x length: %Zu", nodeid,
               (u16) ((addr >> 32) & 0xFFFF), (u32) (addr & 0xFFFFFFFF),
               length);
@@ -2677,7 +2677,7 @@ static long raw1394_iso_xmit_recv_packets32(struct file *file, unsigned int cmd,
                                           struct raw1394_iso_packets32 __user *arg)
 {
        compat_uptr_t infos32;
-       void *infos;
+       void __user *infos;
        long err = -EFAULT;
        struct raw1394_iso_packets __user *dst = compat_alloc_user_space(sizeof(struct raw1394_iso_packets));
 
@@ -2959,7 +2959,6 @@ MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
 
 static struct hpsb_protocol_driver raw1394_driver = {
        .name = "raw1394",
-       .id_table = raw1394_id_table,
 };
 
 /******************************************************************************/
@@ -3004,7 +3003,6 @@ static int __init init_raw1394(void)
 
        cdev_init(&raw1394_cdev, &raw1394_fops);
        raw1394_cdev.owner = THIS_MODULE;
-       kobject_set_name(&raw1394_cdev.kobj, RAW1394_DEVICE_NAME);
        ret = cdev_add(&raw1394_cdev, IEEE1394_RAW1394_DEV, 1);
        if (ret) {
                HPSB_ERR("raw1394 failed to register minor device block");