mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: arch/microblaze/include/asm/socket.h
This commit is contained in:
commit
aa11d958d1
1599 changed files with 38098 additions and 25849 deletions
|
|
@ -687,6 +687,7 @@ static int omap_hdq_remove(struct platform_device *pdev)
|
|||
|
||||
if (hdq_data->hdq_usecount) {
|
||||
dev_dbg(&pdev->dev, "removed when use count is not zero\n");
|
||||
mutex_unlock(&hdq_data->hdq_mutex);
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue