aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/agp/generic.c2
-rw-r--r--drivers/char/bsr.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index fb86708e47ed..4b51982fd23a 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -1214,7 +1214,7 @@ struct agp_memory *agp_generic_alloc_user(size_t page_count, int type)
1214 return NULL; 1214 return NULL;
1215 1215
1216 for (i = 0; i < page_count; i++) 1216 for (i = 0; i < page_count; i++)
1217 new->pages[i] = 0; 1217 new->pages[i] = NULL;
1218 new->page_count = 0; 1218 new->page_count = 0;
1219 new->type = type; 1219 new->type = type;
1220 new->num_scratch_pages = pages; 1220 new->num_scratch_pages = pages;
diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c
index 7fef305774de..89d871ef8c2f 100644
--- a/drivers/char/bsr.c
+++ b/drivers/char/bsr.c
@@ -253,7 +253,7 @@ static int bsr_add_node(struct device_node *bn)
253 253
254 cur->bsr_device = device_create(bsr_class, NULL, cur->bsr_dev, 254 cur->bsr_device = device_create(bsr_class, NULL, cur->bsr_dev,
255 cur, cur->bsr_name); 255 cur, cur->bsr_name);
256 if (!cur->bsr_device) { 256 if (IS_ERR(cur->bsr_device)) {
257 printk(KERN_ERR "device_create failed for %s\n", 257 printk(KERN_ERR "device_create failed for %s\n",
258 cur->bsr_name); 258 cur->bsr_name);
259 cdev_del(&cur->bsr_cdev); 259 cdev_del(&cur->bsr_cdev);