diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2010-07-22 05:56:38 -0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2010-07-27 05:04:11 -0400 |
| commit | c89db7b8bc88d8288dcfbe7a885b950d2560d564 (patch) | |
| tree | b6588c1c885f6219a55aff794681e39062408ad4 | |
| parent | 424d66cedae8bebb00fdb917fc8430f7b8a655cf (diff) | |
firewire: nosy: annotate __user pointers and __iomem pointers
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| -rw-r--r-- | drivers/firewire/nosy.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/firewire/nosy.c b/drivers/firewire/nosy.c index edd729aafeca..b8dcaa28e1ad 100644 --- a/drivers/firewire/nosy.c +++ b/drivers/firewire/nosy.c | |||
| @@ -95,7 +95,7 @@ struct packet_buffer { | |||
| 95 | 95 | ||
| 96 | struct pcilynx { | 96 | struct pcilynx { |
| 97 | struct pci_dev *pci_device; | 97 | struct pci_dev *pci_device; |
| 98 | unsigned char *registers; | 98 | __iomem char *registers; |
| 99 | 99 | ||
| 100 | struct pcl *rcv_start_pcl, *rcv_pcl; | 100 | struct pcl *rcv_start_pcl, *rcv_pcl; |
| 101 | u32 *rcv_buffer; | 101 | u32 *rcv_buffer; |
| @@ -163,7 +163,7 @@ packet_buffer_destroy(struct packet_buffer *buffer) | |||
| 163 | } | 163 | } |
| 164 | 164 | ||
| 165 | static int | 165 | static int |
| 166 | packet_buffer_get(struct client *client, void *data, size_t user_length) | 166 | packet_buffer_get(struct client *client, char __user *data, size_t user_length) |
| 167 | { | 167 | { |
| 168 | struct packet_buffer *buffer = &client->buffer; | 168 | struct packet_buffer *buffer = &client->buffer; |
| 169 | size_t length; | 169 | size_t length; |
| @@ -362,7 +362,7 @@ nosy_poll(struct file *file, poll_table *pt) | |||
| 362 | } | 362 | } |
| 363 | 363 | ||
| 364 | static ssize_t | 364 | static ssize_t |
| 365 | nosy_read(struct file *file, char *buffer, size_t count, loff_t *offset) | 365 | nosy_read(struct file *file, char __user *buffer, size_t count, loff_t *offset) |
| 366 | { | 366 | { |
| 367 | struct client *client = file->private_data; | 367 | struct client *client = file->private_data; |
| 368 | 368 | ||
| @@ -383,7 +383,7 @@ nosy_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
| 383 | stats.lost_packet_count = client->buffer.lost_packet_count; | 383 | stats.lost_packet_count = client->buffer.lost_packet_count; |
| 384 | spin_unlock_irq(client_list_lock); | 384 | spin_unlock_irq(client_list_lock); |
| 385 | 385 | ||
| 386 | if (copy_to_user((void *) arg, &stats, sizeof stats)) | 386 | if (copy_to_user((void __user *) arg, &stats, sizeof stats)) |
| 387 | return -EFAULT; | 387 | return -EFAULT; |
| 388 | else | 388 | else |
| 389 | return 0; | 389 | return 0; |
