From ca3a47a087a3554c8016c75eb2f85101097a2d0f Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Thu, 22 Jul 2010 11:56:38 +0200 Subject: [PATCH] --- yaml --- r: 206784 b: refs/heads/master c: c89db7b8bc88d8288dcfbe7a885b950d2560d564 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/firewire/nosy.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9f5416bf3aef..e6aeb37acf79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 424d66cedae8bebb00fdb917fc8430f7b8a655cf +refs/heads/master: c89db7b8bc88d8288dcfbe7a885b950d2560d564 diff --git a/trunk/drivers/firewire/nosy.c b/trunk/drivers/firewire/nosy.c index edd729aafeca..b8dcaa28e1ad 100644 --- a/trunk/drivers/firewire/nosy.c +++ b/trunk/drivers/firewire/nosy.c @@ -95,7 +95,7 @@ struct packet_buffer { struct pcilynx { struct pci_dev *pci_device; - unsigned char *registers; + __iomem char *registers; struct pcl *rcv_start_pcl, *rcv_pcl; u32 *rcv_buffer; @@ -163,7 +163,7 @@ packet_buffer_destroy(struct packet_buffer *buffer) } static int -packet_buffer_get(struct client *client, void *data, size_t user_length) +packet_buffer_get(struct client *client, char __user *data, size_t user_length) { struct packet_buffer *buffer = &client->buffer; size_t length; @@ -362,7 +362,7 @@ nosy_poll(struct file *file, poll_table *pt) } static ssize_t -nosy_read(struct file *file, char *buffer, size_t count, loff_t *offset) +nosy_read(struct file *file, char __user *buffer, size_t count, loff_t *offset) { struct client *client = file->private_data; @@ -383,7 +383,7 @@ nosy_ioctl(struct file *file, unsigned int cmd, unsigned long arg) stats.lost_packet_count = client->buffer.lost_packet_count; spin_unlock_irq(client_list_lock); - if (copy_to_user((void *) arg, &stats, sizeof stats)) + if (copy_to_user((void __user *) arg, &stats, sizeof stats)) return -EFAULT; else return 0;