diff options
Diffstat (limited to 'drivers/video/gbefb.c')
-rw-r--r-- | drivers/video/gbefb.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c index ca3355e430bf..7e7b7a9ba274 100644 --- a/drivers/video/gbefb.c +++ b/drivers/video/gbefb.c | |||
@@ -721,7 +721,7 @@ static int gbefb_set_par(struct fb_info *info) | |||
721 | 721 | ||
722 | Tiles have the advantage that they can be allocated individually in | 722 | Tiles have the advantage that they can be allocated individually in |
723 | memory. However, this mapping is not linear at all, which is not | 723 | memory. However, this mapping is not linear at all, which is not |
724 | really convienient. In order to support linear addressing, the GBE | 724 | really convenient. In order to support linear addressing, the GBE |
725 | DMA hardware is fooled into thinking the screen is only one tile | 725 | DMA hardware is fooled into thinking the screen is only one tile |
726 | large and but has a greater height, so that the DMA transfer covers | 726 | large and but has a greater height, so that the DMA transfer covers |
727 | the same region. | 727 | the same region. |
@@ -1143,8 +1143,10 @@ static int __devinit gbefb_probe(struct platform_device *p_dev) | |||
1143 | return -ENOMEM; | 1143 | return -ENOMEM; |
1144 | 1144 | ||
1145 | #ifndef MODULE | 1145 | #ifndef MODULE |
1146 | if (fb_get_options("gbefb", &options)) | 1146 | if (fb_get_options("gbefb", &options)) { |
1147 | return -ENODEV; | 1147 | ret = -ENODEV; |
1148 | goto out_release_framebuffer; | ||
1149 | } | ||
1148 | gbefb_setup(options); | 1150 | gbefb_setup(options); |
1149 | #endif | 1151 | #endif |
1150 | 1152 | ||