Attachment 295929 Details for Bug 434802 – Proposed fix

[patch] Proposed fix

linux-2.6-xen-pvfb-probe-suspend-fixes.patch (text/plain), 1.83 KB, created by Markus Armbruster on 2008-02-26 15:11:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Armbruster

Created: 2008-02-26 15:11:13 UTC

Size: 1.83 KB

patch

obsolete

>--- a/drivers/xen/fbfront/xenfb.c	2008-02-26 13:56:30.000000000 +0100
>+++ b/drivers/xen/fbfront/xenfb.c	2008-02-26 14:10:44.000000000 +0100
>@@ -472,7 +472,7 @@ static int __devinit xenfb_probe(struct 
> 
> 	ret = register_framebuffer(fb_info);
> 	if (ret) {
>-		fb_dealloc_cmap(&info->fb_info->cmap);
>+		fb_dealloc_cmap(&fb_info->cmap);
> 		framebuffer_release(fb_info);
> 		xenbus_dev_fatal(dev, ret, "register_framebuffer");
> 		goto error;
>--- a/drivers/xen/fbfront/xenkbd.c	2008-02-26 13:56:03.000000000 +0100
>+++ b/drivers/xen/fbfront/xenkbd.c	2008-02-26 14:09:58.000000000 +0100
>@@ -52,7 +52,7 @@ static irqreturn_t input_handler(int rq,
> 	__u32 cons, prod;
> 
> 	prod = page->in_prod;
>-	if (prod == page->out_cons)
>+	if (prod == page->in_cons)
> 		return IRQ_HANDLED;
> 	rmb();			/* ensure we see ring contents up to prod */
> 	for (cons = page->in_cons; cons != prod; cons++) {
>@@ -95,12 +95,11 @@ int __devinit xenkbd_probe(struct xenbus
> 	}
> 	dev->dev.driver_data = info;
> 	info->xbdev = dev;
>+	info->irq = -1;
> 
>-	info->page = (void *)__get_free_page(GFP_KERNEL);
>+	info->page = (void *)__get_free_page(GFP_KERNEL || __GFP_ZERO);
> 	if (!info->page)
> 		goto error_nomem;
>-	info->page->in_cons = info->page->in_prod = 0;
>-	info->page->out_cons = info->page->out_prod = 0;
> 
> 	input_dev = input_allocate_device();
> 	if (!input_dev)
>@@ -148,6 +147,7 @@ static int xenkbd_resume(struct xenbus_d
> 	struct xenkbd_info *info = dev->dev.driver_data;
> 
> 	xenkbd_disconnect_backend(info);
>+	memset(info->page, 0, PAGE_SIZE);
> 	return xenkbd_connect_backend(dev, info);
> }
> 
>@@ -156,7 +156,8 @@ static int xenkbd_remove(struct xenbus_d
> 	struct xenkbd_info *info = dev->dev.driver_data;
> 
> 	xenkbd_disconnect_backend(info);
>-	input_unregister_device(info->dev);
>+	if (info->dev)
>+		input_unregister_device(info->dev);
> 	free_page((unsigned long)info->page);
> 	kfree(info);
> 	return 0;

Actions: View | Diff

Attachments on bug 434802: 295929