disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/video/fbdev/vermilion/vermilion.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * Copyright (c) Intel Corp. 2007.
3
4
  * All Rights Reserved.
..
..
@@ -6,21 +7,6 @@
6
7
  * develop this driver.
7
8
  *
8
9
  * This file is part of the Vermilion Range fb driver.
9
- * The Vermilion Range fb driver is free software;
10
- * you can redistribute it and/or modify
11
- * it under the terms of the GNU General Public License as published by
12
- * the Free Software Foundation; either version 2 of the License, or
13
- * (at your option) any later version.
14
- *
15
- * The Vermilion Range fb driver is distributed
16
- * in the hope that it will be useful,
17
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
18
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
19
- * GNU General Public License for more details.
20
- *
21
- * You should have received a copy of the GNU General Public License
22
- * along with this driver; if not, write to the Free Software
23
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
24
10
  *
25
11
  * Authors:
26
12
  *   Thomas Hellström <thomas-at-tungstengraphics-dot-com>
..
..
@@ -291,8 +277,10 @@
291
277
 
292
278
 	mutex_unlock(&vml_mutex);
293
279
 
294
-	if (pci_enable_device(par->gpu) < 0)
280
+	if (pci_enable_device(par->gpu) < 0) {
281
+		pci_dev_put(par->gpu);
295
282
 		return -ENODEV;
283
+	}
296
284
 
297
285
 	return 0;
298
286
 }
..
..
@@ -331,7 +319,7 @@
331
319
 		       ": Could not claim display controller MMIO.\n");
332
320
 		return -EBUSY;
333
321
 	}
334
-	par->vdc_mem = ioremap_nocache(par->vdc_mem_base, par->vdc_mem_size);
322
+	par->vdc_mem = ioremap(par->vdc_mem_base, par->vdc_mem_size);
335
323
 	if (par->vdc_mem == NULL) {
336
324
 		printk(KERN_ERR MODULE_NAME
337
325
 		       ": Could not map display controller MMIO.\n");
..
..
@@ -346,7 +334,7 @@
346
334
 		err = -EBUSY;
347
335
 		goto out_err_1;
348
336
 	}
349
-	par->gpu_mem = ioremap_nocache(par->gpu_mem_base, par->gpu_mem_size);
337
+	par->gpu_mem = ioremap(par->gpu_mem_base, par->gpu_mem_size);
350
338
 	if (par->gpu_mem == NULL) {
351
339
 		printk(KERN_ERR MODULE_NAME ": Could not map GPU MMIO.\n");
352
340
 		err = -ENOMEM;