Merge tag 'drm-amdkfd-fixes-2015-02-02' of git://people.freedesktop.org/~gabbayo...
authorDave Airlie <airlied@redhat.com>
Tue, 3 Feb 2015 01:21:11 +0000 (11:21 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 3 Feb 2015 01:21:11 +0000 (11:21 +1000)
commit86640966f6ec8ab2fdc98e916456c6fc9d13262d
treece48e51e3b4381096da36abc79091af8120c0361
parent92773fc77e8f9f42846f104d40c0672c9028a90c
parentb9dce23ddc949faa8ba138f8a0811e177c991bf1
Merge tag 'drm-amdkfd-fixes-2015-02-02' of git://people.freedesktop.org/~gabbayo/linux into drm-fixes

Three small fixes that came up during last week, nothing scary:

- Accidently incremented a counter instead of decrementing it (copy-paste error)
- Module parameter of max num of queues must be at least 1 and not 0
- Don't do BUG() as a result from wrong user input

* tag 'drm-amdkfd-fixes-2015-02-02' of git://people.freedesktop.org/~gabbayo/linux:
  drm/amdkfd: Don't create BUG due to incorrect user parameter
  drm/amdkfd: max num of queues can't be 0
  drm/amdkfd: Fix bug in accounting of queues