diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-13 02:00:49 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-13 02:00:49 +0300 |
| commit | d41adc4e22c62640fa7de93f713a3c5b3638ab2e (patch) | |
| tree | 6510e7f3d1226e602c28701110ea169991cb3e8b /drivers/auxdisplay/hd44780.c | |
| parent | f306b90c69ce3994bb8046b54374a90a27f66be6 (diff) | |
| parent | 24ebc044c72ee6e88dc902a0041bac672f012537 (diff) | |
| download | linux-d41adc4e22c62640fa7de93f713a3c5b3638ab2e.tar.xz | |
Merge tag 'auxdisplay-for-linus-v5.15-rc1' of git://github.com/ojeda/linux
Pull auxdisplay updates from Miguel Ojeda:
"An assortment of improvements for auxdisplay:
- Replace symbolic permissions with octal permissions (Jinchao Wang)
- ks0108: Switch to use module_parport_driver() (Andy Shevchenko)
- charlcd: Drop unneeded initializers and switch to C99 style (Andy
Shevchenko)
- hd44780: Fix oops on module unloading (Lars Poeschel)
- Add I2C gpio expander example (Ralf Schlatterbeck)"
* tag 'auxdisplay-for-linus-v5.15-rc1' of git://github.com/ojeda/linux:
auxdisplay: Replace symbolic permissions with octal permissions
auxdisplay: ks0108: Switch to use module_parport_driver()
auxdisplay: charlcd: Drop unneeded initializers and switch to C99 style
auxdisplay: hd44780: Fix oops on module unloading
auxdisplay: Add I2C gpio expander example
Diffstat (limited to 'drivers/auxdisplay/hd44780.c')
| -rw-r--r-- | drivers/auxdisplay/hd44780.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/auxdisplay/hd44780.c b/drivers/auxdisplay/hd44780.c index 2e5e7c993933..8b2a0eb3f32a 100644 --- a/drivers/auxdisplay/hd44780.c +++ b/drivers/auxdisplay/hd44780.c @@ -323,8 +323,8 @@ static int hd44780_remove(struct platform_device *pdev) { struct charlcd *lcd = platform_get_drvdata(pdev); - kfree(lcd->drvdata); charlcd_unregister(lcd); + kfree(lcd->drvdata); kfree(lcd); return 0; |